m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Haiku: use pkg-config to find lua

Browse Source 
The Lua package for Haiku now comes with a pkg-config file, and the
includes were moved around, so get things working again.
This commit is contained in:
Adrien Destugues 2017-03-19 09:03:30 +01:00
parent 75e25605e2
commit 2d4ad537ad
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Makefile
View File

@ -210,13 +210,14 @@ endif
CP = cp CP = cp
BIN = ../bin/grafx2 BIN = ../bin/grafx2
PLATFORMOBJ = $(OBJDIR)/haiku.o PLATFORMOBJ = $(OBJDIR)/haiku.o
ifeq ($(NOLUA),1) ifeq ($(NOLUA),1)
LUACOPT = LUACOPT =
LUALOPT = LUALOPT =
else else
LUACOPT = -D__ENABLE_LUA__ LUAPKG=lua
LUALOPT = -llua LUACOPT = -D__ENABLE_LUA__ $(shell pkg-config $(LUAPKG) --cflags)
endif LUALOPT = $(shell pkg-config $(LUAPKG) --libs)
endif
COPT = -W -Wall -c -g $(shell sdl-config --cflags) $(TTFCOPT) -I/boot/common/include $(LUACOPT) COPT = -W -Wall -c -g $(shell sdl-config --cflags) $(TTFCOPT) -I/boot/common/include $(LUACOPT)
COPT += -DENABLE_FILENAMES_ICONV COPT += -DENABLE_FILENAMES_ICONV
LOPT = $(shell sdl-config --libs) -lSDL_image -lpng -ljpeg -lz $(TTFLOPT) -lfreetype -lbe $(LUALOPT) -liconv LOPT = $(shell sdl-config --libs) -lSDL_image -lpng -ljpeg -lz $(TTFLOPT) -lfreetype -lbe $(LUALOPT) -liconv