projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed bug with calling function with invalid (although ignored) parameter
[rocksndiamonds.git]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index bb33ce8ca879edb73d58b27d31d43afc3e01c589..da2806bb2a3496aa1d4b7c8dcfdcfa55882b1f01 100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-32,6
+32,8
@@
CONVERT_ICON_ARGS = -transparent black -background transparent
PROGBASE = rocksndiamonds
PROGNAME = ../$(PROGBASE)
PROGBASE = rocksndiamonds
PROGNAME = ../$(PROGBASE)
+EDITION ?= default
+
# -----------------------------------------------------------------------------
# configuring platform
# -----------------------------------------------------------------------------
# configuring platform
@@
-97,15
+99,10
@@
ifdef RW_GAME_DIR # path to writable game data specified
CONFIG_RW_GAME_DIR = -DRW_GAME_DIR="\"$(RW_GAME_DIR)\""
endif
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
DEBUG = -DDEBUG -g
+
# PROFILING = $(PROFILING_FLAGS)
# OPTIONS = $(DEBUG) -Wall # only for debugging purposes
# PROFILING = $(PROFILING_FLAGS)
# OPTIONS = $(DEBUG) -Wall # only for debugging purposes
@@
-200,14
+197,17
@@
GAME_EM = $(GAME_EM_DIR)/game_em.a
GAME_SP_DIR = game_sp
GAME_SP = $(GAME_SP_DIR)/game_sp.a
GAME_SP_DIR = game_sp
GAME_SP = $(GAME_SP_DIR)/game_sp.a
-RNDLIBS = $(LIBGAME) $(GAME_EM) $(GAME_SP)
+GAME_MM_DIR = game_mm
+GAME_MM = $(GAME_MM_DIR)/game_mm.a
+
+RNDLIBS = $(LIBGAME) $(GAME_EM) $(GAME_SP) $(GAME_MM)
AUTOCONF = conf_gfx.h conf_snd.h conf_mus.h
ICONBASE = windows_icon
ICON_BASEPATH = ../Special/Icons/windows_icons
ifeq ($(PLATFORM),cross-win32)
AUTOCONF = conf_gfx.h conf_snd.h conf_mus.h
ICONBASE = windows_icon
ICON_BASEPATH = ../Special/Icons/windows_icons
ifeq ($(PLATFORM),cross-win32)
-ICON_PATH = $(ICON_BASEPATH)/
default
+ICON_PATH = $(ICON_BASEPATH)/
$(EDITION)
ICON = $(ICONBASE).o
endif
ICON = $(ICONBASE).o
endif
@@
-218,7
+218,7
@@
GRAPHICS_DIR = ../graphics
# build targets
# -----------------------------------------------------------------------------
# build targets
# -----------------------------------------------------------------------------
-all: $(AUTOCONF) libgame_dir game_em_dir game_sp_dir $(PROGNAME) graphics_dir
+all: $(AUTOCONF) libgame_dir game_em_dir game_sp_dir
game_mm_dir
$(PROGNAME) graphics_dir
$(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(OBJS) $(ICON)
$(CC) $(PROFILING) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME)
$(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(OBJS) $(ICON)
$(CC) $(PROFILING) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME)
@@
-241,6
+241,11
@@
game_sp_dir:
$(GAME_SP):
@$(MAKE) -C $(GAME_SP_DIR)
$(GAME_SP):
@$(MAKE) -C $(GAME_SP_DIR)
+game_mm_dir:
+ @$(MAKE) -C $(GAME_MM_DIR)
+$(GAME_MM):
+ @$(MAKE) -C $(GAME_MM_DIR)
+
auto-conf:
@for i in $(CNFS); do \
echo "$(CNFS_CMD) $$i > $$i"; \
auto-conf:
@for i in $(CNFS); do \
echo "$(CNFS_CMD) $$i > $$i"; \
@@
-281,6
+286,7
@@
clean-obj:
$(MAKE) -C $(LIBGAME_DIR) clean
$(MAKE) -C $(GAME_EM_DIR) clean
$(MAKE) -C $(GAME_SP_DIR) clean
$(MAKE) -C $(LIBGAME_DIR) clean
$(MAKE) -C $(GAME_EM_DIR) clean
$(MAKE) -C $(GAME_SP_DIR) clean
+ $(MAKE) -C $(GAME_MM_DIR) clean
$(RM) $(OBJS)
$(RM) $(RNDLIBS)
$(RM) $(OBJS)
$(RM) $(RNDLIBS)
@@
-319,12
+325,13
@@
valgrind:
# -----------------------------------------------------------------------------
tags:
# -----------------------------------------------------------------------------
tags:
- $(ETAGS) *.[ch] $(LIBGAME_DIR)/*.[ch] $(GAME_EM_DIR)/*.[ch] $(GAME_SP_DIR)/*.[ch]
+ $(ETAGS) *.[ch] $(LIBGAME_DIR)/*.[ch] $(GAME_EM_DIR)/*.[ch] $(GAME_SP_DIR)/*.[ch]
$(GAME_MM_DIR)/*.[ch]
depend:
$(MAKE) -C $(LIBGAME_DIR) depend
$(MAKE) -C $(GAME_EM_DIR) depend
$(MAKE) -C $(GAME_SP_DIR) depend
depend:
$(MAKE) -C $(LIBGAME_DIR) depend
$(MAKE) -C $(GAME_EM_DIR) depend
$(MAKE) -C $(GAME_SP_DIR) depend
+ $(MAKE) -C $(GAME_MM_DIR) depend
for i in $(SRCS); do $(CPP) $(CFLAGS) -M $$i; done > .depend
ifeq (.depend,$(wildcard .depend))
for i in $(SRCS); do $(CPP) $(CFLAGS) -M $$i; done > .depend
ifeq (.depend,$(wildcard .depend))