added optional sanitizer flags when using Clang

[rocksndiamonds.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 0456b906a58798e4a7c5728b791ce757abe66e54..ec8cb5e9224ae2eb74b8124dd5da4d1a472f0dd5 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -62,14 +62,17 @@ endif
 
 ifeq ($(PLATFORM),emscripten)          # compiling with Emscripten
 PROGNAME = ../$(PROGBASE).js
+DATA_FILE = $(PROGBASE).data
 CC = emcc
 AR = emar
 RANLIB = emranlib
 STRIP = true
+FILE_PACKAGER = file_packager
 endif
 
 ifeq ($(shell uname -s),Darwin)                # compiling on Mac OS X
 DEBUGGER = lldb --batch -o "run" -k "bt" -k "quit"
+SANITIZING_FLAGS = -fsanitize=undefined
 ifdef BUILD_DIST                       # distribution build
 MAC_TARGET_VERSION_MIN = 10.7
 EXTRA_FLAGS_MAC = -mmacosx-version-min=$(MAC_TARGET_VERSION_MIN)
@@ -97,10 +100,12 @@ endif
 
 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_LDFLAGS = $(SDL_FMTS) -s INITIAL_MEMORY=81920000 -s ALLOW_MEMORY_GROWTH=1 --preload-file ../conf/ --preload-file ../docs/ --preload-file ../levels/ --preload-file ../graphics/ --preload-file ../sounds/ --preload-file ../music/ -s NO_EXIT_RUNTIME=0 -s ASYNCIFY -O2 -lidbfs.js
+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
@@ -122,7 +127,8 @@ CONFIG = $(CONFIG_BASE_PATH) $(JOYSTICK)
 
 DEBUG = -DDEBUG -g
 
-# PROFILING = $(PROFILING_FLAGS)
+# ANALYZE = $(PROFILING_FLAGS)
+# ANALYZE = $(SANITIZING_FLAGS)
 
 # OPTIONS = $(DEBUG) -Wall                     # only for debugging purposes
 # OPTIONS = $(DEBUG) -O2 -Wall                 # only for debugging purposes
@@ -143,8 +149,8 @@ SYS_LDFLAGS := $(shell echo $(SYS_LDFLAGS) |        \
 OPTIONS = -O2 -Wall
 endif
 
-CFLAGS = $(OPTIONS) $(SYS_CFLAGS)  $(EXTRA_CFLAGS) $(CONFIG)
-LDFLAGS =           $(SYS_LDFLAGS) $(EXTRA_LDFLAGS)
+CFLAGS = $(OPTIONS) $(ANALYZE) $(SYS_CFLAGS)  $(EXTRA_CFLAGS) $(CONFIG)
+LDFLAGS =           $(ANALYZE) $(SYS_LDFLAGS) $(EXTRA_LDFLAGS)
 
 
 SRCS = main.c          \
@@ -162,6 +168,7 @@ SRCS =      main.c          \
        files.c         \
        tape.c          \
        anim.c          \
+       api.c           \
        network.c       \
        netserv.c
 
@@ -180,6 +187,7 @@ OBJS =      main.o          \
        files.o         \
        tape.o          \
        anim.o          \
+       api.o           \
        network.o       \
        netserv.o
 
@@ -192,6 +200,8 @@ CNFS =      conf_gfx.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      \
@@ -251,10 +261,13 @@ GRAPHICS_DIR = ../graphics
 all: $(AUTOCONF) libgame_dir game_em_dir game_sp_dir game_mm_dir $(PROGNAME) graphics_dir
 
 $(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(COMMIT_HASH_FILE) $(OBJS) $(ICON)
-       $(CC) $(PROFILING) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME)
+       $(CC) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME)
 ifdef BUILD_DIST
        $(STRIP) $(PROGNAME)
 endif
+ifeq ($(PLATFORM),emscripten)
+       (cd .. ; $(FILE_PACKAGER) $(DATA_FILE) $(FILE_PACKAGER_ARGS))
+endif
 
 libgame_dir:
        @$(MAKE) -C $(LIBGAME_DIR)
@@ -305,6 +318,8 @@ conf-hash:
        @echo '#define SOURCE_HASH_STRING "$(SOURCE_HASH_STRING)"' \
        > $(COMMIT_HASH_FILE)
 
+config.o: config.c $(TIMESTAMP_FILE)
+
 $(TIMESTAMP_FILE): $(SRCS) $(RNDLIBS)
        @$(MAKE) conf-time
 
@@ -317,7 +332,7 @@ $(ICON):
        echo "$(ICONBASE) ICON $(ICONBASE).ico" | $(WINDRES) -o $(ICON)
 
 .c.o:
-       $(CC) $(PROFILING) $(CFLAGS) -c $*.c
+       $(CC) $(CFLAGS) -c $*.c
 
 graphics_dir:
        @test -f $(GRAPHICS_DIR)/Makefile && $(MAKE) -C $(GRAPHICS_DIR) || true