diff --git a/Makefile.common b/Makefile.common index 189f74b..b1aaff4 100644 --- a/Makefile.common +++ b/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) $(CFLAGS) $(LDFLAGS) + @$(CC) $(GAME_OBJS) $(RES_GAMELIB_OUT) -o $(RES_GAME_OUT) $(LIBS) $(LDFLAGS) diff --git a/Makefile.emscripten b/Makefile.emscripten index 70e4bc9..9edad66 100644 --- a/Makefile.emscripten +++ b/Makefile.emscripten @@ -7,15 +7,16 @@ ECHO = echo LIBS = CFLAGS = -s FULL_ES2=1 -s ASM_JS=1 -O1 -Wno-implicit-function-declaration -DEMSCRIPTEN -LDFLAGS = --preload-file data +LDFLAGS = --preload-file data -s FULL_ES2=1 -s ASM_JS=1 -O1 -Wno-implicit-function-declaration -DEMSCRIPTEN 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 - BUILDDIR=build-emscripten-release + CFLAGS = -s FULL_ES2=1 -s ASM_JS=1 -O2 --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 endif include Makefile.common diff --git a/Makefile.mingw b/Makefile.mingw index 1ea8aed..d062e6f 100644 --- a/Makefile.mingw +++ b/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 = +LDFLAGS = -mwindows RES_GAMELIB = libgame.a RES_GAME = game.exe diff --git a/Makefile.win32 b/Makefile.win32 index 64692e5..b02a6d3 100644 --- a/Makefile.win32 +++ b/Makefile.win32 @@ -7,7 +7,7 @@ ECHO = echo LIBS = -L/mingw/lib -Dmain=SDL_main -lopengl32 -lSDLmain -lSDL CFLAGS = -I/mingw/include -g -mwindows -D_GNU_SOURCE=1 -LDFLAGS = +LDFLAGS = -g -mwindows -D_GNU_SOURCE=1 RES_GAMELIB = libgame.a RES_GAME = game.exe diff --git a/dist.emscripten.sh b/dist.emscripten.sh index 2a7900d..b836d18 100644 --- a/dist.emscripten.sh +++ b/dist.emscripten.sh @@ -1,8 +1,12 @@ #!/bin/sh -make -f Makefile.emscripten target=release clean -make -f Makefile.emscripten target=release +#make -f Makefile.emscripten target=release clean +#make -f Makefile.emscripten target=release + +make -f Makefile.emscripten clean +make -f Makefile.emscripten mkdir -p DIST/web cp -Rv web/* DIST/web/ -cp -v build-emscripten-release/game.* DIST/web/ +#cp -v build-emscripten-release/game.* DIST/web/ +cp -v build-emscripten/game.* DIST/web/ diff --git a/web/play.html b/web/play.html index 2c81889..d058413 100644 --- a/web/play.html +++ b/web/play.html @@ -3,7 +3,7 @@
-