VAR/GameLib
1
1
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Fixes to the build system

Browse Source
This commit is contained in:
Valeriano A.R.
2016-04-16 16:50:32 +02:00
committed by Valeriano A.R
parent e4647d3838
commit f1154b5494
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.common
View File

@@ -112,7 +112,7 @@ $(RES_GAMELIB_OUT): $(GAMELIBS_OBJS)
$(RES_GAME_OUT): $(RES_GAMELIB_OUT) $(GAME_OBJS) $(RES_GAME_OUT): $(RES_GAMELIB_OUT) $(GAME_OBJS)
@$(ECHO) "LINK: $@" @$(ECHO) "LINK: $@"
@$(CC) $(GAME_OBJS) $(RES_GAMELIB_OUT) -o $(RES_GAME_OUT) $(LIBS) $(LDFLAGS) @$(CC) $(GAME_OBJS) $(RES_GAMELIB_OUT) -o $(RES_GAME_OUT) $(CFLAGS) $(LIBS) $(LDFLAGS)

6
Makefile.emscripten
View File

@@ -7,16 +7,16 @@ ECHO = echo
LIBS = LIBS =
CFLAGS = -s FULL_ES2=1 -s ASM_JS=1 -O1 -Wno-implicit-function-declaration -DEMSCRIPTEN CFLAGS = -s FULL_ES2=1 -s ASM_JS=1 -O1 -Wno-implicit-function-declaration -DEMSCRIPTEN
LDFLAGS = --preload-file data -s FULL_ES2=1 -s ASM_JS=1 -O1 -Wno-implicit-function-declaration -DEMSCRIPTEN LDFLAGS = --preload-file data
RES_GAMELIB = libgame.a RES_GAMELIB = libgame.a
RES_GAME = game.html RES_GAME = game.html
BUILDDIR = build-emscripten BUILDDIR = build-emscripten
ifeq ($(target),release) ifeq ($(target),release)
CFLAGS = -s FULL_ES2=1 -s ASM_JS=1 -O2 --llvm-lto 1 -Wno-implicit-function-declaration -DEMSCRIPTEN CFLAGS = -s FULL_ES2=1 -s ASM_JS=1 -O1 --llvm-lto 1 -Wno-implicit-function-declaration -DEMSCRIPTEN
BUILDDIR = build-emscripten-release BUILDDIR = build-emscripten-release
LDFLAGS = --preload-file data -s FULL_ES2=1 -s ASM_JS=1 -O2 --llvm-lto 1 -Wno-implicit-function-declaration -DEMSCRIPTEN LDFLAGS = --preload-file data
endif endif
include Makefile.common include Makefile.common

2
Makefile.mingw
View File

@@ -7,7 +7,7 @@ ECHO = echo
LIBS = -L/usr/i486-mingw/lib -D_GNU_SOURCE=1 -Dmain=SDL_main -lopengl32 -lmingw32 -lSDLmain -lSDL LIBS = -L/usr/i486-mingw/lib -D_GNU_SOURCE=1 -Dmain=SDL_main -lopengl32 -lmingw32 -lSDLmain -lSDL
CFLAGS = -I/usr/i486-mingw/include -mwindows CFLAGS = -I/usr/i486-mingw/include -mwindows
LDFLAGS = -mwindows LDFLAGS =
RES_GAMELIB = libgame.a RES_GAMELIB = libgame.a
RES_GAME = game.exe RES_GAME = game.exe