#545 CI changes
This commit is contained in:
parent
39b1608afc
commit
b63af63e06
17
Makefile
17
Makefile
|
@ -40,15 +40,14 @@ GTK_INCLUDES= `pkg-config --cflags gtk+-3.0`
|
|||
GTK_LIBS= `pkg-config --libs gtk+-3.0`
|
||||
|
||||
LINUX_INCLUDES= \
|
||||
$(GTK_INCLUDES) \
|
||||
`sdl2-config --cflags`
|
||||
$(GTK_INCLUDES)
|
||||
|
||||
LINUX_LIBS= \
|
||||
$(GTK_LIBS) \
|
||||
`sdl2-config --static-libs` \
|
||||
-L$(3RD_PARTY)/wren-0.1.0/lib \
|
||||
-L$(3RD_PARTY)/sdl-gpu/build/linux \
|
||||
-L$(3RD_PARTY)/lua-5.3.1/src
|
||||
-L$(3RD_PARTY)/lua-5.3.1/src \
|
||||
-L$(3RD_PARTY)/SDL2-2.0.7/build/.libs
|
||||
|
||||
LINUX64_LIBS= \
|
||||
$(GTK_LIBS) \
|
||||
|
@ -83,7 +82,9 @@ LINUX_LINKER_FLAGS= \
|
|||
-lrt \
|
||||
-lz \
|
||||
-lsdlgpu \
|
||||
-lGL
|
||||
-lGL \
|
||||
-lSDL2
|
||||
|
||||
|
||||
MINGW_OUTPUT=$(BIN_NAME).exe
|
||||
|
||||
|
@ -366,6 +367,7 @@ chip-lto-pro:
|
|||
WREN_A=$(3RD_PARTY)/wren-0.1.0/lib/libwren.a
|
||||
SDLGPU_A=$(3RD_PARTY)/sdl-gpu/build/linux/libsdlgpu.a
|
||||
LUA_A=$(3RD_PARTY)/lua-5.3.1/src/liblua.a
|
||||
SDL2_A=$(3RD_PARTY)/SDL2-2.0.7/build/.libs/libSDL2.a
|
||||
|
||||
$(WREN_A):
|
||||
make static -C $(3RD_PARTY)/wren-0.1.0/
|
||||
|
@ -376,7 +378,10 @@ $(SDLGPU_A):
|
|||
$(LUA_A):
|
||||
make linux -C $(3RD_PARTY)/lua-5.3.1/
|
||||
|
||||
linux: $(WREN_A) $(SDLGPU_A) $(LUA_A)
|
||||
$(SDL2_A):
|
||||
cd $(3RD_PARTY)/SDL2-2.0.7/ && ./configure && make && cd ../..
|
||||
|
||||
linux: $(WREN_A) $(SDLGPU_A) $(LUA_A) $(SDL2_A)
|
||||
$(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:
|
||||
|
|
Loading…
Reference in New Issue