X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=Makefile;h=41840b0cb6e2734dd816b2dd57051631069f5bfa;hp=d5a21886056fd8d7d6048bd14295a3ea87866427;hb=a8e936aa644b673bdd5d34c888acd92b562c82dc;hpb=120fe36da3055f5b869d0a72307c6013fae865f7 diff --git a/Makefile b/Makefile index d5a21886..41840b0c 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # ============================================================================= # Rocks'n'Diamonds - McDuffin Strikes Back! # ----------------------------------------------------------------------------- -# (c) 1995-2014 by Artsoft Entertainment +# (c) 1995-2015 by Artsoft Entertainment # Holger Schemel # info@artsoft.org # http://www.artsoft.org/ @@ -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 @@ -76,9 +73,6 @@ sdl2: mac: @$(MAKE_CMD) PLATFORM=macosx -mac-static: - @$(MAKE_CMD) PLATFORM=macosx STATIC=true - cross-win32: @PATH=$(CROSS_PATH_WIN32)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-win32 @@ -123,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 @@ -156,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