X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=Makefile;h=538c451c55863a85b87a08bccd80e27971598d11;hb=6413b637e99f65b72fa0bbb007e6dc4dd03196d1;hp=f047a8076d112e84c3d14e78602378e931ae8f71;hpb=a2c9a458aaa4ac568f07ecd25b19fbca3f766e6b;p=rocksndiamonds.git

diff --git a/Makefile b/Makefile
index f047a807..538c451c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # =============================================================================
 # Rocks'n'Diamonds Makefile
 # -----------------------------------------------------------------------------
-# (c) 1995-2003 Holger Schemel <info@artsoft.org>
+# (c) 1995-2005 Holger Schemel <info@artsoft.org>
 # =============================================================================
 
 # -----------------------------------------------------------------------------
@@ -50,8 +50,8 @@ CROSS_PATH_WIN32=/usr/local/cross-tools/i386-mingw32msvc
 SRC_DIR = src
 MAKE_CMD = $(MAKE) -C $(SRC_DIR)
 
-DEFAULT_TARGET = x11
-# DEFAULT_TARGET = sdl
+# DEFAULT_TARGET = x11
+DEFAULT_TARGET = sdl
 
 
 # -----------------------------------------------------------------------------
@@ -79,6 +79,9 @@ mac:
 msdos:
 	@$(MAKE_CMD) PLATFORM=msdos
 
+os2:
+	@$(MAKE_CMD) PLATFORM=os2
+
 cross-msdos:
 	@PATH=$(CROSS_PATH_MSDOS)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-msdos
 
@@ -96,21 +99,27 @@ clean:
 auto-conf:
 	@$(MAKE_CMD) auto-conf
 
-run:
-	@$(MAKE_CMD) TARGET=$(DEFAULT_TARGET) && ./rocksndiamonds --verbose
+run: all
+	@./rocksndiamonds --verbose
 
-gdb:
-	@$(MAKE_CMD) TARGET=$(DEFAULT_TARGET) && gdb ./rocksndiamonds
+gdb: all
+	@gdb -batch -x GDB_COMMANDS ./rocksndiamonds
 
-valgrind:
-	valgrind -v --leak-check=yes ./rocksndiamonds 2> valgrind.out
+valgrind: all
+	@valgrind -v --leak-check=yes ./rocksndiamonds 2> valgrind.out
 
-enginetest:
+enginetest: all
 	./Scripts/make_enginetest.sh
 
-enginetestfast:
+enginetestcustom: all
+	./Scripts/make_enginetest.sh custom
+
+enginetestfast: all
 	./Scripts/make_enginetest.sh fast
 
+enginetestnew: all
+	./Scripts/make_enginetest.sh new
+
 backup:
 	./Scripts/make_backup.sh src
 
@@ -166,5 +175,8 @@ dist-all: dist-build-all dist-unix dist-msdos dist-win32 dist-macosx
 
 upload-all: upload-unix upload-msdos upload-win32 upload-macosx
 
+tags:
+	$(MAKE_CMD) tags
+
 depend dep:
 	$(MAKE_CMD) depend