X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=Makefile;h=00e7695b304c300c432e5e4d28fdd875c44125fc;hp=9c0fa9dcca6ccf5b79ab3e5d9a789df1a2d8efa4;hb=070915c688903880c053bc444cc7f161fdebd91d;hpb=f7cee51ad23b10be242545a6445fddf45accf65d

diff --git a/Makefile b/Makefile
index 9c0fa9dc..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>
 # =============================================================================
 
 # -----------------------------------------------------------------------------
@@ -46,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
 
 
 # -----------------------------------------------------------------------------
@@ -59,7 +59,7 @@ SRC_DIR = src
 MAKE_CMD = $(MAKE) -C $(SRC_DIR)
 
 # DEFAULT_TARGET = x11
-DEFAULT_TARGET = sdl
+DEFAULT_TARGET = sdl2
 
 
 # -----------------------------------------------------------------------------
@@ -75,6 +75,9 @@ x11:
 sdl:
 	@$(MAKE_CMD) TARGET=sdl
 
+sdl2:
+	@$(MAKE_CMD) TARGET=sdl2
+
 solaris:
 	@$(MAKE_CMD) PLATFORM=solaris TARGET=x11
 
@@ -87,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
 
@@ -143,7 +149,7 @@ backup:
 backup-net-copy:
 	./Scripts/make_backup.sh src scp
 
-backup-net: backup backup-net-copy
+backup-all: backup backup-net-copy
 
 backup_lev:
 	./Scripts/make_backup.sh lev
@@ -155,14 +161,16 @@ backup_gfx:
 #	./Scripts/make_prerelease.sh
 
 jue:
-	sed -e 's/# SPECIAL_EDITION/SPECIAL_EDITION/' Makefile > Makefile.jue
-	$(MAKE) -f Makefile.jue cross-win32
+	@$(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) x11
+	@BUILD_DIST=TRUE $(MAKE)
 
 dist-build-msdos:
 	@BUILD_DIST=TRUE $(MAKE) cross-msdos
@@ -171,7 +179,10 @@ dist-build-win32:
 	@BUILD_DIST=TRUE $(MAKE) cross-win32
 
 dist-build-macosx:
-	# (this is done by "dist-package-macosx" target)
+#	(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 .
@@ -185,6 +196,9 @@ dist-package-win32:
 dist-package-macosx:
 	./Scripts/make_dist.sh mac . $(MAKE)
 
+dist-package-macosx-ppc:
+	./Scripts/make_dist.sh mac-ppc . $(MAKE)
+
 dist-upload-unix:
 	./Scripts/make_dist.sh unix . upload
 
@@ -197,6 +211,9 @@ dist-upload-win32:
 dist-upload-macosx:
 	./Scripts/make_dist.sh mac . upload
 
+dist-upload-macosx-ppc:
+	./Scripts/make_dist.sh mac-ppc . upload
+
 dist-build-all:
 	$(MAKE) clean
 	$(MAKE) dist-build-unix		; $(MAKE) dist-clean
@@ -207,12 +224,14 @@ 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
@@ -223,4 +242,4 @@ tags:
 	$(MAKE_CMD) tags
 
 depend dep:
-	$(MAKE_CMD) depend
+	$(MAKE_CMD) TARGET=$(DEFAULT_TARGET) depend