X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=Makefile;h=bf09646daa34bb1b8136ea31f0cf5ecced63cba3;hb=ceb7ded99fc9cc9519adeea07808a344678c196e;hp=63962f78924e68df5efd4b390463345ae240b459;hpb=df11f4a529251a285f3a33946da81623044fef3f;p=rocksndiamonds.git

diff --git a/Makefile b/Makefile
index 63962f78..bf09646d 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
 
@@ -100,7 +106,7 @@ run: all
 	@./rocksndiamonds --verbose
 
 gdb: all
-	@gdb ./rocksndiamonds
+	@gdb -batch -x GDB_COMMANDS ./rocksndiamonds
 
 valgrind: all
 	@valgrind -v --leak-check=yes ./rocksndiamonds 2> valgrind.out
@@ -114,6 +120,9 @@ enginetestcustom: all
 enginetestfast: all
 	./Scripts/make_enginetest.sh fast
 
+enginetestnew: all
+	./Scripts/make_enginetest.sh new
+
 backup:
 	./Scripts/make_backup.sh src
 
@@ -163,11 +172,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