X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=Makefile;h=4a242ed022c7a4655e17a3e334bbd703eb9a54b1;hb=dce12aedb7f597d85daf4ae5dfc4e058ae2f7b5c;hp=ddb3f97da55d64abc2f03c9524f6073da0b79dda;hpb=942ec4881e3b21c130df9ae105d06c2c633fa192;p=rocksndiamonds.git

diff --git a/Makefile b/Makefile
index ddb3f97d..4a242ed0 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
 
 
 # -----------------------------------------------------------------------------
@@ -76,9 +76,15 @@ solaris-sdl:
 mac:
 	@$(MAKE_CMD) PLATFORM=macosx
 
+mac-static:
+	@$(MAKE_CMD) PLATFORM=macosx TARGET=sdl-static
+
 msdos:
 	@$(MAKE_CMD) PLATFORM=msdos
 
+os2:
+	@$(MAKE_CMD) PLATFORM=os2
+
 cross-msdos:
 	@PATH=$(CROSS_PATH_MSDOS)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-msdos
 
@@ -96,24 +102,30 @@ 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
 
-enginetestcustom:
+enginetestcustom: all
 	./Scripts/make_enginetest.sh custom
 
-enginetestfast:
+enginetestfast: all
 	./Scripts/make_enginetest.sh fast
 
+enginetestnew: all
+	./Scripts/make_enginetest.sh new
+
+leveltest: all
+	./Scripts/make_enginetest.sh leveltest
+
 backup:
 	./Scripts/make_backup.sh src
 
@@ -123,6 +135,9 @@ backup_lev:
 backup_gfx:
 	./Scripts/make_backup.sh gfx
 
+# prerelease:
+#	./Scripts/make_prerelease.sh
+
 dist-unix:
 	./Scripts/make_dist.sh unix .
 
@@ -163,11 +178,16 @@ dist-build-all:
 	$(MAKE) clean
 	$(MAKE) dist-build-unix		; $(MAKE) dist-clean
 	$(MAKE) dist-build-win32	; $(MAKE) dist-clean
-	$(MAKE) dist-build-msdos	; $(MAKE) dist-clean
+#	$(MAKE) dist-build-msdos	; $(MAKE) dist-clean
+
+# dist-all: dist-build-all dist-unix dist-msdos dist-win32 dist-macosx
+dist-all: dist-build-all dist-unix dist-win32 dist-macosx
 
-dist-all: dist-build-all dist-unix dist-msdos dist-win32 dist-macosx
+# upload-all: upload-unix upload-msdos upload-win32 upload-macosx
+upload-all: upload-unix upload-win32 upload-macosx
 
-upload-all: upload-unix upload-msdos upload-win32 upload-macosx
+tags:
+	$(MAKE_CMD) tags
 
 depend dep:
 	$(MAKE_CMD) depend