X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=Makefile;h=00e7695b304c300c432e5e4d28fdd875c44125fc;hb=a7c06161253796a30a0237a7f5a044f459c8cf35;hp=8fb5f1d9b91725e60d5f596881bafb5ce99a2a72;hpb=9f907eef20bc6b488473d29310d2384eee3619da;p=rocksndiamonds.git

diff --git a/Makefile b/Makefile
index 8fb5f1d9..00e7695b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # =============================================================================
 # Rocks'n'Diamonds Makefile
 # -----------------------------------------------------------------------------
-# (c) 1995-2007 Holger Schemel <info@artsoft.org>
+# (c) 1995-2013 Holger Schemel <info@artsoft.org>
 # =============================================================================
 
 # -----------------------------------------------------------------------------
@@ -22,10 +22,14 @@ X11_PATH = /usr/X11R6
 # directory for read-only game data (like graphics, sounds, levels)
 # default is '.' to be able to run program without installation
 # RO_GAME_DIR = /usr/games
+# use the following setting for Debian / Ubuntu installations:
+# RO_GAME_DIR = /usr/share/games/rocksndiamonds
 
 # directory for writable game data (like highscore files)
 # default is '.' to be able to run program without installation
 # RW_GAME_DIR = /var/games
+# use the following setting for Debian / Ubuntu installations:
+# RW_GAME_DIR = /var/games/rocksndiamonds
 
 # uncomment if system has no joystick include file
 # JOYSTICK = -DNO_JOYSTICK
@@ -42,7 +46,7 @@ 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
+# SPECIAL_EDITION = rnd_jue
 
 
 # -----------------------------------------------------------------------------
@@ -55,7 +59,7 @@ SRC_DIR = src
 MAKE_CMD = $(MAKE) -C $(SRC_DIR)
 
 # DEFAULT_TARGET = x11
-DEFAULT_TARGET = sdl
+DEFAULT_TARGET = sdl2
 
 
 # -----------------------------------------------------------------------------
@@ -71,6 +75,9 @@ x11:
 sdl:
 	@$(MAKE_CMD) TARGET=sdl
 
+sdl2:
+	@$(MAKE_CMD) TARGET=sdl2
+
 solaris:
 	@$(MAKE_CMD) PLATFORM=solaris TARGET=x11
 
@@ -83,6 +90,9 @@ mac:
 mac-static:
 	@$(MAKE_CMD) PLATFORM=macosx TARGET=sdl-static
 
+mac2-static:
+	@$(MAKE_CMD) PLATFORM=macosx TARGET=sdl2-static
+
 msdos:
 	@$(MAKE_CMD) PLATFORM=msdos
 
@@ -100,7 +110,7 @@ clean:
 
 
 # -----------------------------------------------------------------------------
-# development only
+# development, test, distribution build and packaging targets
 # -----------------------------------------------------------------------------
 
 auto-conf:
@@ -130,14 +140,16 @@ enginetestnew: all
 leveltest: all
 	./Scripts/make_enginetest.sh leveltest
 
+levelsketch_images: all
+	./Scripts/make_levelsketch_images.sh
+
 backup:
-	./Scripts/make_backup.sh src 1
+	./Scripts/make_backup.sh src tar
 
-backup2:
-	./Scripts/make_backup.sh src 2
+backup-net-copy:
+	./Scripts/make_backup.sh src scp
 
-backup3:
-	./Scripts/make_backup.sh src 3
+backup-all: backup backup-net-copy
 
 backup_lev:
 	./Scripts/make_backup.sh lev
@@ -148,41 +160,59 @@ backup_gfx:
 # prerelease:
 #	./Scripts/make_prerelease.sh
 
-dist-unix:
+jue:
+	@$(MAKE) SPECIAL_EDITION=rnd_jue all
+
+jue-win:
+	@$(MAKE) SPECIAL_EDITION=rnd_jue cross-win32
+
+dist-clean:
+	@$(MAKE_CMD) dist-clean
+
+dist-build-unix:
+	@BUILD_DIST=TRUE $(MAKE)
+
+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-build-macosx-ppc:
+#	(this is done by "dist-package-macosx-ppc" 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-package-macosx-ppc:
+	./Scripts/make_dist.sh mac-ppc . $(MAKE)
+
+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-upload-macosx-ppc:
+	./Scripts/make_dist.sh mac-ppc . upload
 
 dist-build-all:
 	$(MAKE) clean
@@ -190,14 +220,26 @@ dist-build-all:
 	$(MAKE) dist-build-win32	; $(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-package-all:
+	$(MAKE) dist-package-unix
+	$(MAKE) dist-package-win32
+	$(MAKE) dist-package-macosx
+	$(MAKE) dist-package-macosx-ppc
+#	$(MAKE) dist-package-msdos
+
+dist-upload-all:
+	$(MAKE) dist-upload-unix
+	$(MAKE) dist-upload-win32
+	$(MAKE) dist-upload-macosx
+	$(MAKE) dist-upload-macosx-ppc
+#	$(MAKE) dist-upload-msdos
+
+dist-all: dist-build-all dist-package-all
 
-# upload-all: upload-unix upload-msdos upload-win32 upload-macosx
-upload-all: upload-unix upload-win32 upload-macosx
+upload-all: dist-upload-all
 
 tags:
 	$(MAKE_CMD) tags
 
 depend dep:
-	$(MAKE_CMD) depend
+	$(MAKE_CMD) TARGET=$(DEFAULT_TARGET) depend