removed preprocessor definition for single or multiple high score entries

[rocksndiamonds.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 2fe28d6b37ac158bde97a5d8333e0eae79427ef4..bacc168d1e95b9b1f6b1a864646e17eb7c9c4b96 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -97,15 +97,10 @@ ifdef RW_GAME_DIR                   # path to writable game data specified
 CONFIG_RW_GAME_DIR = -DRW_GAME_DIR="\"$(RW_GAME_DIR)\""
 endif
 
-ifdef SCORE_ENTRIES                    # number of score entries per player
-CONFIG_SCORE_ENTRIES = -D$(SCORE_ENTRIES)
-endif
-
-CONFIG_GAME_DIR = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR)
-CONFIG_GAME = $(CONFIG_GAME_DIR) $(CONFIG_SCORE_ENTRIES)
+CONFIG = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR) $(JOYSTICK)
 
-CONFIG = $(CONFIG_GAME) $(JOYSTICK)
 DEBUG = -DDEBUG -g
+
 # PROFILING = $(PROFILING_FLAGS)
 
 # OPTIONS = $(DEBUG) -Wall                     # only for debugging purposes
@@ -140,7 +135,7 @@ SRCS =      main.c          \
        editor.c        \
        files.c         \
        tape.c          \
-       cartoons.c      \
+       anim.c          \
        network.c       \
        netserv.c
 
@@ -158,7 +153,7 @@ OBJS =      main.o          \
        editor.o        \
        files.o         \
        tape.o          \
-       cartoons.o      \
+       anim.o          \
        network.o       \
        netserv.o
 
@@ -183,6 +178,13 @@ CNFS =     conf_gfx.h      \
 CNFS_CMD = ../build-scripts/create_element_defs.pl
 
 TIMESTAMP_FILE = conftime.h
+TIMESTAMP_FORMAT = %Y-%m-%d %H:%M
+
+# use SOURCE_DATE_EPOCH, or else last Git commit date, or else current date
+SOURCE_DATE_EPOCH ?= $(shell test -d ../.git && test `git ls-files -m | wc -l` -eq 0 && git show -s --format=%ct || date +%s)
+
+# get source date string from either GNU / Linux or BSD / Mac OS X style "date"
+SOURCE_DATE_STRING := $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+$(TIMESTAMP_FORMAT)"  2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+$(TIMESTAMP_FORMAT)" 2>/dev/null || date -u "+$(TIMESTAMP_FORMAT)")
 
 LIBGAME_DIR = libgame
 LIBGAME = $(LIBGAME_DIR)/libgame.a
@@ -215,6 +217,9 @@ all: $(AUTOCONF) libgame_dir game_em_dir game_sp_dir $(PROGNAME) graphics_dir
 
 $(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(OBJS) $(ICON)
        $(CC) $(PROFILING) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME)
+ifdef BUILD_DIST
+       strip $(PROGNAME)
+endif
 
 libgame_dir:
        @$(MAKE) -C $(LIBGAME_DIR)
@@ -252,10 +257,8 @@ conf_snd.h: conf_snd.c $(CNFS_CMD)
 conf_mus.h: conf_mus.c $(CNFS_CMD)
        @$(MAKE) auto-conf
 
-# $(TIMESTAMP_FILE): $(SRCS) $(LIBGAME) $(GAME_EM) $(GAME_SP)
 $(TIMESTAMP_FILE): $(SRCS) $(RNDLIBS)
-       @date '+"%Y-%m-%d %H:%M"' \
-       | sed -e 's/^/#define COMPILE_DATE_STRING /' \
+       @echo '#define SOURCE_DATE_STRING "$(SOURCE_DATE_STRING)"' \
        > $(TIMESTAMP_FILE)
 
 $(ICON):
@@ -267,7 +270,7 @@ $(ICON):
        $(CC) $(PROFILING) $(CFLAGS) -c $*.c
 
 graphics_dir:
-       @$(MAKE) -C $(GRAPHICS_DIR)
+       @test -f $(GRAPHICS_DIR)/Makefile && $(MAKE) -C $(GRAPHICS_DIR) || true
 
 clean-obj:
        $(MAKE) -C $(LIBGAME_DIR) clean
@@ -275,9 +278,6 @@ clean-obj:
        $(MAKE) -C $(GAME_SP_DIR) clean
        $(RM) $(OBJS)
        $(RM) $(RNDLIBS)
-#      $(RM) $(LIBGAME)
-#      $(RM) $(GAME_EM)
-#      $(RM) $(GAME_SP)
 
 clean-ico:
        $(RM) $(ICONBASE).ico
@@ -292,6 +292,8 @@ clean: clean-obj clean-ico clean-bin
 clean-git: clean auto-conf-clean
        @$(MAKE) -C $(GRAPHICS_DIR) clean
 
+dist-clean: clean-obj clean-ico
+
 
 # -----------------------------------------------------------------------------
 # run and test targets
@@ -311,8 +313,6 @@ valgrind:
 # development only
 # -----------------------------------------------------------------------------
 
-dist-clean: clean-obj
-
 tags:
        $(ETAGS) *.[ch] $(LIBGAME_DIR)/*.[ch] $(GAME_EM_DIR)/*.[ch] $(GAME_SP_DIR)/*.[ch]