Fixes to the build system

Makefile.common

@@ -112,7 +112,7 @@ $(RES_GAMELIB_OUT): $(GAMELIBS_OBJS)
 
 $(RES_GAME_OUT): $(RES_GAMELIB_OUT) $(GAME_OBJS)
 	@$(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)
 
 
 

Makefile.emscripten

@@ -7,16 +7,16 @@ ECHO     = echo
 
 LIBS    =
 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_GAME    = game.html
 BUILDDIR    = build-emscripten
 
 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
-	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
 
 include Makefile.common

Makefile.mingw

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