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

diff --git a/Makefile b/Makefile
index 63962f78..ea1154ef 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # =============================================================================
 # Rocks'n'Diamonds Makefile
 # -----------------------------------------------------------------------------
-# (c) 1995-2003 Holger Schemel <info@artsoft.org>
+# (c) 1995-2007 Holger Schemel <info@artsoft.org>
 # =============================================================================
 
 # -----------------------------------------------------------------------------
@@ -38,8 +38,12 @@ X11_PATH = /usr/X11R6
 # SCORE_ENTRIES = MANY_PER_NAME
 
 # paths for cross-compiling (only needed for non-native MS-DOS and Win32 build)
-CROSS_PATH_MSDOS=/usr/local/cross-msdos/i386-msdosdjgpp
-CROSS_PATH_WIN32=/usr/local/cross-tools/i386-mingw32msvc
+CROSS_PATH_MSDOS = /usr/local/cross-msdos/i386-msdosdjgpp
+CROSS_PATH_WIN32 = /usr/local/cross-tools/i386-mingw32msvc
+
+# compile special edition of R'n'D instead of the normal (classic) version
+SPECIAL_EDITION = rnd_jue
+
 
 # -----------------------------------------------------------------------------
 # there should be no need to change anything below
@@ -50,8 +54,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 +80,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
 
@@ -90,20 +100,20 @@ clean:
 
 
 # -----------------------------------------------------------------------------
-# development only
+# development, test, distribution build and packaging targets
 # -----------------------------------------------------------------------------
 
 auto-conf:
 	@$(MAKE_CMD) auto-conf
 
 run: all
-	@./rocksndiamonds --verbose
+	@$(MAKE_CMD) run
 
 gdb: all
-	@gdb ./rocksndiamonds
+	@$(MAKE_CMD) gdb
 
 valgrind: all
-	@valgrind -v --leak-check=yes ./rocksndiamonds 2> valgrind.out
+	@$(MAKE_CMD) valgrind
 
 enginetest: all
 	./Scripts/make_enginetest.sh
@@ -114,8 +124,20 @@ enginetestcustom: all
 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
+	./Scripts/make_backup.sh src 1
+
+backup2:
+	./Scripts/make_backup.sh src 2
+
+backup3:
+	./Scripts/make_backup.sh src 3
 
 backup_lev:
 	./Scripts/make_backup.sh lev
@@ -123,51 +145,72 @@ backup_lev:
 backup_gfx:
 	./Scripts/make_backup.sh gfx
 
-dist-unix:
+# prerelease:
+#	./Scripts/make_prerelease.sh
+
+dist-clean:
+	@$(MAKE_CMD) dist-clean
+
+dist-build-unix:
+	@BUILD_DIST=TRUE $(MAKE) x11
+
+dist-build-msdos:
+	@BUILD_DIST=TRUE $(MAKE) cross-msdos
+
+dist-build-win32:
+	@BUILD_DIST=TRUE $(MAKE) cross-win32
+
+dist-build-macosx:
+	# (this is done by "dist-package-macosx" target)
+
+dist-package-unix:
 	./Scripts/make_dist.sh unix .
 
-dist-msdos:
+dist-package-msdos:
 	./Scripts/make_dist.sh dos .
 
-dist-win32:
+dist-package-win32:
 	./Scripts/make_dist.sh win .
 
-dist-macosx:
+dist-package-macosx:
 	./Scripts/make_dist.sh mac . $(MAKE)
 
-upload-unix:
+dist-upload-unix:
 	./Scripts/make_dist.sh unix . upload
 
-upload-msdos:
+dist-upload-msdos:
 	./Scripts/make_dist.sh dos . upload
 
-upload-win32:
+dist-upload-win32:
 	./Scripts/make_dist.sh win . upload
 
-upload-macosx:
+dist-upload-macosx:
 	./Scripts/make_dist.sh mac . upload
 
-dist-clean:
-	@$(MAKE_CMD) dist-clean
-
-dist-build-unix:
-	@BUILD_DIST=TRUE $(MAKE) x11
-
-dist-build-win32:
-	@BUILD_DIST=TRUE $(MAKE) cross-win32
-
-dist-build-msdos:
-	@BUILD_DIST=TRUE $(MAKE) cross-msdos
-
 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-package-all:
+	$(MAKE) dist-package-unix
+	$(MAKE) dist-package-win32
+	$(MAKE) dist-package-macosx
+#	$(MAKE) dist-package-msdos
+
+dist-upload-all:
+	$(MAKE) dist-upload-unix
+	$(MAKE) dist-upload-win32
+	$(MAKE) dist-upload-macosx
+#	$(MAKE) dist-upload-msdos
+
+dist-all: dist-build-all dist-package-all
 
-dist-all: dist-build-all dist-unix dist-msdos dist-win32 dist-macosx
+upload-all: dist-upload-all
 
-upload-all: upload-unix upload-msdos upload-win32 upload-macosx
+tags:
+	$(MAKE_CMD) tags
 
 depend dep:
 	$(MAKE_CMD) depend