X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=Makefile;h=41840b0cb6e2734dd816b2dd57051631069f5bfa;hp=7fcfdeba00334e49fd5eb13e3cb3cbd00740eecd;hb=a8e936aa644b673bdd5d34c888acd92b562c82dc;hpb=abe44529b439ad39b4d8dbf19cbd67c9b9844279

diff --git a/Makefile b/Makefile
index 7fcfdeba..41840b0c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # =============================================================================
 # Rocks'n'Diamonds - McDuffin Strikes Back!
 # -----------------------------------------------------------------------------
-# (c) 1995-2014 by Artsoft Entertainment
-#     		    Holger Schemel
-#		    info@artsoft.org
-#		    http://www.artsoft.org/
+# (c) 1995-2015 by Artsoft Entertainment
+#                  Holger Schemel
+#                  info@artsoft.org
+#                  http://www.artsoft.org/
 # -----------------------------------------------------------------------------
 # Makefile
 # =============================================================================
@@ -46,9 +46,6 @@ MAKE = make
 # path for cross-compiling (only needed for non-native Windows build)
 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
@@ -59,15 +56,13 @@ CROSS_PATH_WIN32 = /usr/local/cross-tools/i386-mingw32msvc
 SRC_DIR = src
 MAKE_CMD = $(MAKE) -C $(SRC_DIR)
 
-DEFAULT_TARGET = sdl2
-
 
 # -----------------------------------------------------------------------------
 # build targets
 # -----------------------------------------------------------------------------
 
 all:
-	@$(MAKE_CMD) TARGET=$(DEFAULT_TARGET)
+	@$(MAKE_CMD)
 
 sdl:
 	@$(MAKE_CMD) TARGET=sdl
@@ -78,21 +73,15 @@ sdl2:
 mac:
 	@$(MAKE_CMD) PLATFORM=macosx
 
-mac-static:
-	@$(MAKE_CMD) PLATFORM=macosx TARGET=sdl-static
-
-mac2-static:
-	@$(MAKE_CMD) PLATFORM=macosx TARGET=sdl2-static
-
-os2:
-	@$(MAKE_CMD) PLATFORM=os2
-
 cross-win32:
 	@PATH=$(CROSS_PATH_WIN32)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-win32
 
 clean:
 	@$(MAKE_CMD) clean
 
+clean-git:
+	@$(MAKE_CMD) clean-git
+
 
 # -----------------------------------------------------------------------------
 # development, test, distribution build and packaging targets
@@ -128,29 +117,6 @@ leveltest: all
 levelsketch_images: all
 	./Scripts/make_levelsketch_images.sh
 
-backup:
-	./Scripts/make_backup.sh src tar
-
-backup-net-copy:
-	./Scripts/make_backup.sh src scp
-
-backup-all: backup backup-net-copy
-
-backup_lev:
-	./Scripts/make_backup.sh lev
-
-backup_gfx:
-	./Scripts/make_backup.sh gfx
-
-# prerelease:
-#	./Scripts/make_prerelease.sh
-
-jue:
-	@$(MAKE) SPECIAL_EDITION=rnd_jue all
-
-jue-win:
-	@$(MAKE) SPECIAL_EDITION=rnd_jue cross-win32
-
 dist-clean:
 	@$(MAKE_CMD) dist-clean
 
@@ -161,53 +127,37 @@ 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)
+	@BUILD_DIST=TRUE $(MAKE)
 
 dist-package-unix:
-	./Scripts/make_dist.sh unix .
+	./Scripts/make_dist.sh package unix
 
 dist-package-win32:
-	./Scripts/make_dist.sh win .
+	./Scripts/make_dist.sh package win
 
 dist-package-macosx:
-	./Scripts/make_dist.sh mac . $(MAKE)
-
-dist-package-macosx-ppc:
-	./Scripts/make_dist.sh mac-ppc . $(MAKE)
+	./Scripts/make_dist.sh package mac
 
 dist-upload-unix:
-	./Scripts/make_dist.sh unix . upload
+	./Scripts/make_dist.sh upload unix
 
 dist-upload-win32:
-	./Scripts/make_dist.sh win . upload
+	./Scripts/make_dist.sh upload win
 
 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
-	$(MAKE) dist-build-win32	; $(MAKE) dist-clean
+	./Scripts/make_dist.sh upload mac
 
 dist-package-all:
 	$(MAKE) dist-package-unix
 	$(MAKE) dist-package-win32
 	$(MAKE) dist-package-macosx
-	$(MAKE) dist-package-macosx-ppc
 
 dist-upload-all:
 	$(MAKE) dist-upload-unix
 	$(MAKE) dist-upload-win32
 	$(MAKE) dist-upload-macosx
-	$(MAKE) dist-upload-macosx-ppc
 
-dist-all: dist-build-all dist-package-all
+package-all: dist-package-all
 
 upload-all: dist-upload-all
 
@@ -215,4 +165,4 @@ tags:
 	$(MAKE_CMD) tags
 
 depend dep:
-	$(MAKE_CMD) TARGET=$(DEFAULT_TARGET) depend
+	$(MAKE_CMD) depend