dan/TIC-80-guile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makefile fix for lua lib

Browse Source
This commit is contained in:
tic
2018-03-16 13:43:54 +03:00
parent 48945febbd
commit 5aa3525d6e
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@@ -47,7 +47,8 @@ LINUX_LIBS= \
$(GTK_LIBS) \ $(GTK_LIBS) \
`sdl2-config --static-libs` \ `sdl2-config --static-libs` \
-L$(3RD_PARTY)/wren-0.1.0/lib \ -L$(3RD_PARTY)/wren-0.1.0/lib \
-L$(3RD_PARTY)/sdl-gpu/build/linux -L$(3RD_PARTY)/sdl-gpu/build/linux \
-L$(3RD_PARTY)/lua-5.3.1/src
LINUX64_LIBS= \ LINUX64_LIBS= \
$(GTK_LIBS) \ $(GTK_LIBS) \
@@ -74,7 +75,7 @@ LINUX_LINKER_LTO_FLAGS= \
-lGL -lGL
LINUX_LINKER_FLAGS= \ LINUX_LINKER_FLAGS= \
-llua5.3 \ -llua \
-lwren \ -lwren \
-ldl \ -ldl \
-lm \ -lm \
@@ -364,6 +365,7 @@ chip-lto-pro:
WREN_A=$(3RD_PARTY)/wren-0.1.0/lib/libwren.a WREN_A=$(3RD_PARTY)/wren-0.1.0/lib/libwren.a
SDLGPU_A=$(3RD_PARTY)/sdl-gpu/build/linux/libsdlgpu.a SDLGPU_A=$(3RD_PARTY)/sdl-gpu/build/linux/libsdlgpu.a
LUA_A=$(3RD_PARTY)/lua-5.3.1/src/liblua.a
$(WREN_A): $(WREN_A):
make static -C $(3RD_PARTY)/wren-0.1.0/ make static -C $(3RD_PARTY)/wren-0.1.0/
@@ -371,7 +373,10 @@ $(WREN_A):
$(SDLGPU_A): $(SDLGPU_A):
make -C $(3RD_PARTY)/sdl-gpu/build/linux/ make -C $(3RD_PARTY)/sdl-gpu/build/linux/
linux: $(WREN_A) $(SDLGPU_A) $(LUA_A):
make linux -C $(3RD_PARTY)/lua-5.3.1/
linux: $(WREN_A) $(SDLGPU_A) $(LUA_A)
$(CC) $(LINUX_INCLUDES) $(SOURCES) $(SYSTEM) $(LPEG_SRC) $(GIF_SRC) $(SOURCES_EXT) $(TIC80_SRC) $(OPT) $(INCLUDES) $(LINUX_LIBS) $(LINUX_LINKER_FLAGS) -o $(BIN_NAME) $(CC) $(LINUX_INCLUDES) $(SOURCES) $(SYSTEM) $(LPEG_SRC) $(GIF_SRC) $(SOURCES_EXT) $(TIC80_SRC) $(OPT) $(INCLUDES) $(LINUX_LIBS) $(LINUX_LINKER_FLAGS) -o $(BIN_NAME)
linux-pro: linux-pro: