X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=Makefile;h=a30bf9cecac5f060ef5192fdd99e8f35f4b52a6c;hp=03320a5f4f056718e1161f2f3c5cb25a6115e2f4;hb=730deaee1a38f75d749a21cddbb562c2b339cc73;hpb=b05bf3dca0ec7d951f1113066093843804e5be06 diff --git a/Makefile b/Makefile index 03320a5f..a30bf9ce 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 @@ -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,15 +73,6 @@ 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 @@ -148,12 +134,6 @@ backup_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 @@ -218,4 +198,4 @@ tags: $(MAKE_CMD) tags depend dep: - $(MAKE_CMD) TARGET=$(DEFAULT_TARGET) depend + $(MAKE_CMD) depend