projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor whitespace change
[rocksndiamonds.git]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index 0db8f54d511017105f573f6f2242f89ea5e5245b..b9a75a6bb4289a691393fc810c41ff534e8943b4 100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-39,6
+39,8
@@
WINDRES = windres
CONVERT_ICON_ARGS = -transparent black -background transparent
CONVERT_ICON_ARGS = -transparent black -background transparent
+DEBUGGER = gdb -batch -ex "run" -ex "bt"
+
PROGBASE = rocksndiamonds
PROGNAME = ../$(PROGBASE)
PROGBASE = rocksndiamonds
PROGNAME = ../$(PROGBASE)
@@
-60,14
+62,17
@@
endif
ifeq ($(PLATFORM),emscripten) # compiling with Emscripten
PROGNAME = ../$(PROGBASE).js
ifeq ($(PLATFORM),emscripten) # compiling with Emscripten
PROGNAME = ../$(PROGBASE).js
+DATA_FILE = $(PROGBASE).data
CC = emcc
AR = emar
RANLIB = emranlib
STRIP = true
CC = emcc
AR = emar
RANLIB = emranlib
STRIP = true
+FILE_PACKAGER = file_packager
endif
endif
-ifdef BUILD_DIST # distribution build
ifeq ($(shell uname -s),Darwin) # compiling on Mac OS X
ifeq ($(shell uname -s),Darwin) # compiling on Mac OS X
+DEBUGGER = lldb --batch -o "run" -k "bt" -k "quit"
+ifdef BUILD_DIST # distribution build
MAC_TARGET_VERSION_MIN = 10.7
EXTRA_FLAGS_MAC = -mmacosx-version-min=$(MAC_TARGET_VERSION_MIN)
EXTRA_CFLAGS = $(EXTRA_FLAGS_MAC)
MAC_TARGET_VERSION_MIN = 10.7
EXTRA_FLAGS_MAC = -mmacosx-version-min=$(MAC_TARGET_VERSION_MIN)
EXTRA_CFLAGS = $(EXTRA_FLAGS_MAC)
@@
-94,10
+99,12
@@
endif
ifeq ($(TARGET),sdl2) # compiling for SDL2 target
ifeq ($(PLATFORM),emscripten)
ifeq ($(TARGET),sdl2) # compiling for SDL2 target
ifeq ($(PLATFORM),emscripten)
-SDL_LIBS = -s USE_SDL_IMAGE=2 -s USE_SDL_MIXER=2 -s USE_SDL_NET=2 -s USE_ZLIB=1
-SDL_FMTS = -s SDL2_IMAGE_FORMATS='["bmp","png","pcx","xpm"]'
+SDL_LIBS = -s USE_SDL_IMAGE=2 -s USE_SDL_MIXER=2 -s USE_SDL_NET=2 -s USE_
MODPLUG=1 -s USE_MPG123=1 -s USE_
ZLIB=1
+SDL_FMTS = -s SDL2_IMAGE_FORMATS='["bmp","png","pcx","xpm"]'
-s SDL2_MIXER_FORMATS='["mod","mp3"]'
EXTRA_CFLAGS = $(SDL_LIBS)
EXTRA_CFLAGS = $(SDL_LIBS)
-EXTRA_LDFLAGS = $(SDL_FMTS) -s INITIAL_MEMORY=65536000 -s ALLOW_MEMORY_GROWTH=1 --preload-file ../graphics/ --preload-file ../sounds/ --preload-file ../levels/ --preload-file ../music/ -s NO_EXIT_RUNTIME=0 -s ASYNCIFY -O2
+EXTRA_LDFLAGS = $(SDL_FMTS) -s INITIAL_MEMORY=81920000 -s ALLOW_MEMORY_GROWTH=1 -s FORCE_FILESYSTEM -s NO_EXIT_RUNTIME=0 -s ASYNCIFY -O2 -lidbfs.js
+DATA_DIRS = conf docs levels graphics sounds music
+FILE_PACKAGER_ARGS = --preload $(DATA_DIRS) --js-output=$(DATA_FILE).js
else
SDL_LIBS = -lSDL2_image -lSDL2_mixer -lSDL2_net
endif
else
SDL_LIBS = -lSDL2_image -lSDL2_mixer -lSDL2_net
endif
@@
-111,15
+118,11
@@
endif
# configuring compile-time definitions
# -----------------------------------------------------------------------------
# configuring compile-time definitions
# -----------------------------------------------------------------------------
-ifdef RO_GAME_DIR # path to read-only game data specified
-CONFIG_RO_GAME_DIR = -DRO_GAME_DIR="\"$(RO_GAME_DIR)\""
-endif
-
-ifdef RW_GAME_DIR # path to writable game data specified
-CONFIG_RW_GAME_DIR = -DRW_GAME_DIR="\"$(RW_GAME_DIR)\""
+ifdef BASE_PATH # path to read-only game data
+CONFIG_BASE_PATH = -DBASE_PATH="\"$(BASE_PATH)\""
endif
endif
-CONFIG = $(CONFIG_
RO_GAME_DIR) $(CONFIG_RW_GAME_DIR
) $(JOYSTICK)
+CONFIG = $(CONFIG_
BASE_PATH
) $(JOYSTICK)
DEBUG = -DDEBUG -g
DEBUG = -DDEBUG -g
@@
-134,6
+137,10
@@
OPTIONS = $(DEBUG) -Wall -Wstrict-prototypes -Wmissing-prototypes
# OPTIONS = -O2 -Wall
# OPTIONS = -O2
# OPTIONS = -O2 -Wall
# OPTIONS = -O2
+ifdef BUILD_TEST # test build
+OPTIONS := $(OPTIONS) -DTESTING
+endif
+
ifdef BUILD_DIST # distribution build
SYS_LDFLAGS := $(shell echo $(SYS_LDFLAGS) | \
sed -e "s%-rpath,[^ ]*%-rpath,'\$$ORIGIN/lib'%")
ifdef BUILD_DIST # distribution build
SYS_LDFLAGS := $(shell echo $(SYS_LDFLAGS) | \
sed -e "s%-rpath,[^ ]*%-rpath,'\$$ORIGIN/lib'%")
@@
-159,6
+166,7
@@
SRCS = main.c \
files.c \
tape.c \
anim.c \
files.c \
tape.c \
anim.c \
+ api.c \
network.c \
netserv.c
network.c \
netserv.c
@@
-177,6
+185,7
@@
OBJS = main.o \
files.o \
tape.o \
anim.o \
files.o \
tape.o \
anim.o \
+ api.o \
network.o \
netserv.o
network.o \
netserv.o
@@
-189,6
+198,8
@@
CNFS = conf_gfx.h \
conf_cus.h \
conf_grp.c \
conf_grp.h \
conf_cus.h \
conf_grp.c \
conf_grp.h \
+ conf_emp.c \
+ conf_emp.h \
conf_e2g.c \
conf_esg.c \
conf_e2s.c \
conf_e2g.c \
conf_esg.c \
conf_e2s.c \
@@
-252,6
+263,9
@@
$(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(COMMIT_HASH_FILE) $(OBJS) $(ICON)
ifdef BUILD_DIST
$(STRIP) $(PROGNAME)
endif
ifdef BUILD_DIST
$(STRIP) $(PROGNAME)
endif
+ifeq ($(PLATFORM),emscripten)
+ (cd .. ; $(FILE_PACKAGER) $(DATA_FILE) $(FILE_PACKAGER_ARGS))
+endif
libgame_dir:
@$(MAKE) -C $(LIBGAME_DIR)
libgame_dir:
@$(MAKE) -C $(LIBGAME_DIR)
@@
-354,7
+368,7
@@
run:
cd .. && ./$(PROGBASE) --verbose
gdb:
cd .. && ./$(PROGBASE) --verbose
gdb:
- cd .. &&
gdb -batch -x GDB_COMMANDS ./
$(PROGBASE)
+ cd .. &&
$(DEBUGGER)
$(PROGBASE)
valgrind:
cd .. && valgrind -v --leak-check=yes ./$(PROGBASE) 2> valgrind.out
valgrind:
cd .. && valgrind -v --leak-check=yes ./$(PROGBASE) 2> valgrind.out