X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2FMakefile;h=20b8f36790085e47ac016cb2d2759f61ffd2f01e;hb=5a5ca477c9e938c8fdc728798efab02298fd8055;hp=a7c587c2c5ce7b4ccd1e5ff9590cdfeb9b637fbc;hpb=852a8eef1e8858a40da0be4093eba3deaf468f51;p=rocksndiamonds.git

diff --git a/src/Makefile b/src/Makefile
index a7c587c2..20b8f367 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -228,7 +228,10 @@ LIBGAME = $(LIBGAME_DIR)/libgame.a
 GAME_EM_DIR = game_em
 GAME_EM = $(GAME_EM_DIR)/game_em.a
 
-RNDLIBS = $(LIBGAME) $(GAME_EM)
+GAME_SP_DIR = game_sp
+GAME_SP = $(GAME_SP_DIR)/game_sp.a
+
+RNDLIBS = $(LIBGAME) $(GAME_EM) $(GAME_SP)
 
 ICONBASE = windows_icon
 ifeq ($(PLATFORM),cross-win32)
@@ -246,7 +249,7 @@ endif
 # build targets
 # -----------------------------------------------------------------------------
 
-all: libgame_dir game_em_dir $(PROGNAME)
+all: libgame_dir game_em_dir game_sp_dir $(PROGNAME)
 
 $(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(OBJS) $(ICON)
 	$(CC) $(PROFILING) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME)
@@ -261,6 +264,11 @@ game_em_dir:
 $(GAME_EM):
 	@$(MAKE) -C $(GAME_EM_DIR)
 
+game_sp_dir:
+	@$(MAKE) -C $(GAME_SP_DIR)
+$(GAME_SP):
+	@$(MAKE) -C $(GAME_SP_DIR)
+
 auto-conf:
 	@for i in $(CNFS); do			\
 		echo "$(CNFS_CMD) $$i > $$i";	\
@@ -276,7 +284,7 @@ conf_snd.h: conf_snd.c
 conf_mus.h: conf_mus.c
 	@$(MAKE) auto-conf
 
-$(TIMESTAMP_FILE): $(SRCS) $(LIBGAME) $(GAME_EM)
+$(TIMESTAMP_FILE): $(SRCS) $(LIBGAME) $(GAME_EM) $(GAME_SP)
 	@date '+"%Y-%m-%d %H:%M"' \
 	| sed -e 's/^/#define COMPILE_DATE_STRING /' \
 	> $(TIMESTAMP_FILE)
@@ -291,9 +299,11 @@ $(ICON):
 clean-obj:
 	$(MAKE) -C $(LIBGAME_DIR) clean
 	$(MAKE) -C $(GAME_EM_DIR) clean
+	$(MAKE) -C $(GAME_SP_DIR) clean
 	$(RM) $(OBJS)
 	$(RM) $(LIBGAME)
 	$(RM) $(GAME_EM)
+	$(RM) $(GAME_SP)
 
 clean-ico:
 	$(RM) $(ICONBASE).ico
@@ -306,6 +316,20 @@ clean-bin:
 clean: clean-obj clean-ico clean-bin
 
 
+# -----------------------------------------------------------------------------
+# run and test targets
+# -----------------------------------------------------------------------------
+
+run: all
+	cd .. && ./$(PROGBASE) --verbose
+
+gdb: all
+	cd .. && gdb -batch -x GDB_COMMANDS ./$(PROGBASE)
+
+valgrind: all
+	cd .. && valgrind -v --leak-check=yes ./$(PROGBASE) 2> valgrind.out
+
+
 # -----------------------------------------------------------------------------
 # development only
 # -----------------------------------------------------------------------------
@@ -313,11 +337,12 @@ clean: clean-obj clean-ico clean-bin
 dist-clean: clean-obj
 
 tags:
-	$(ETAGS) *.[ch] $(LIBGAME_DIR)/*.[ch] $(GAME_EM_DIR)/*.[ch]
+	$(ETAGS) *.[ch] $(LIBGAME_DIR)/*.[ch] $(GAME_EM_DIR)/*.[ch] $(GAME_SP_DIR)/*.[ch]
 
 depend:
 	$(MAKE) -C $(LIBGAME_DIR) depend
 	$(MAKE) -C $(GAME_EM_DIR) depend
+	$(MAKE) -C $(GAME_SP_DIR) depend
 	for i in $(SRCS); do $(CPP) $(CFLAGS) -M $$i; done > .depend
 
 ifeq (.depend,$(wildcard .depend))