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 14:28:00 +02:00
committed by Valeriano A.R
parent 62eefa5177
commit e4647d3838
6 changed files with 15 additions and 10 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)
@$(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)

5
Makefile.emscripten
View File

@@ -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
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

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
CFLAGS = -I/usr/i486-mingw/include -mwindows
LDFLAGS =
LDFLAGS = -mwindows
RES_GAMELIB = libgame.a
RES_GAME = game.exe

2
Makefile.win32
View File

@@ -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

10
dist.emscripten.sh
View File

@@ -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/

2
web/play.html
View File

@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Lonely Ruins</title>
<title>Game</title>
</head>
<style>
html, body {