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

Merge branch 'master' into sdl_extract

Browse Source
This commit is contained in:
BADIM-PC\Vadim
2018-02-06 20:05:31 +03:00
parent 85748cf477 6721fb6d8d
commit 2b890c7efe
7 changed files with 62 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@@ -46,14 +46,15 @@ LINUX_INCLUDES= \
LINUX_LIBS= \
$(GTK_LIBS) \
`sdl2-config --static-libs`
`sdl2-config --static-libs` \
-L$(3RD_PARTY)/wren-0.1.0/lib
LINUX64_LIBS= \
$(LINUX_LIBS) \
$(GTK_LIBS) \
-L$(PRE_BUILT)/linux64
LINUX32_LIBS= \
$(LINUX_LIBS) \
$(GTK_LIBS) \
-L$(PRE_BUILT)/linux32
LINUX_ARM_LIBS= \
@@ -323,14 +324,14 @@ run: mingw-pro
$(MINGW_OUTPUT)
linux64-lto:
$(CC) $(LINUX_INCLUDES) $(SOURCES) $(TIC80_SRC) $(SOURCES_EXT) $(OPT) $(INCLUDES) $(LINUX64_LIBS) $(LINUX_LINKER_LTO_FLAGS) -flto -o $(BIN_NAME)
$(CC) $(GTK_INCLUDES) $(SOURCES) $(TIC80_SRC) $(SOURCES_EXT) $(OPT) $(INCLUDES) $(LINUX64_LIBS) $(LINUX_LINKER_LTO_FLAGS) -flto -o $(BIN_NAME)
linux64-lto-pro:
$(eval OPT += $(OPT_PRO))
make linux64-lto OPT="$(OPT)"
linux32-lto:
$(CC) $(LINUX_INCLUDES) $(SOURCES) $(TIC80_SRC) $(SOURCES_EXT) $(OPT) $(INCLUDES) $(LINUX32_LIBS) $(LINUX_LINKER_LTO_FLAGS) -flto -o $(BIN_NAME)
$(CC) $(GTK_INCLUDES) $(SOURCES) $(TIC80_SRC) $(SOURCES_EXT) $(OPT) $(INCLUDES) $(LINUX32_LIBS) $(LINUX_LINKER_LTO_FLAGS) -flto -o $(BIN_NAME)
linux32-lto-pro:
$(eval OPT += $(OPT_PRO))