changed name of compilation flag to be more generic

[rocksndiamonds.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 2acbd109cae9ddde05ecd8d101e316584717ee0f..60a43700887a4b838d5409d2d55a130d1020bd27 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -99,8 +99,8 @@ 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 -s FORCE_FILESYSTEM -s NO_EXIT_RUNTIME=0 -s ASYNCIFY -O2 -lidbfs.js
 DATA_DIRS = conf docs levels graphics sounds music
@@ -126,7 +126,7 @@ CONFIG = $(CONFIG_BASE_PATH) $(JOYSTICK)
 
 DEBUG = -DDEBUG -g
 
-# PROFILING = $(PROFILING_FLAGS)
+# ANALYZE = $(PROFILING_FLAGS)
 
 # OPTIONS = $(DEBUG) -Wall                     # only for debugging purposes
 # OPTIONS = $(DEBUG) -O2 -Wall                 # only for debugging purposes
@@ -166,6 +166,7 @@ SRCS =      main.c          \
        files.c         \
        tape.c          \
        anim.c          \
+       api.c           \
        network.c       \
        netserv.c
 
@@ -184,6 +185,7 @@ OBJS =      main.o          \
        files.o         \
        tape.o          \
        anim.o          \
+       api.o           \
        network.o       \
        netserv.o
 
@@ -257,7 +259,7 @@ 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) $(ANALYZE) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME)
 ifdef BUILD_DIST
        $(STRIP) $(PROGNAME)
 endif
@@ -314,6 +316,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
 
@@ -326,7 +330,7 @@ $(ICON):
        echo "$(ICONBASE) ICON $(ICONBASE).ico" | $(WINDRES) -o $(ICON)
 
 .c.o:
-       $(CC) $(PROFILING) $(CFLAGS) -c $*.c
+       $(CC) $(ANALYZE) $(CFLAGS) -c $*.c
 
 graphics_dir:
        @test -f $(GRAPHICS_DIR)/Makefile && $(MAKE) -C $(GRAPHICS_DIR) || true