fixed aborting program due to '-psn' parameter when launched via GUI on Mac

[rocksndiamonds.git] / Makefile

diff --git a/Makefile b/Makefile
index 96e630396baff70bcf8dd2dd3a5e7e684061617d..a30bf9cecac5f060ef5192fdd99e8f35f4b52a6c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,12 @@
 # =============================================================================
-# Rocks'n'Diamonds Makefile
+# Rocks'n'Diamonds - McDuffin Strikes Back!
 # -----------------------------------------------------------------------------
-# (c) 1995-2013 Holger Schemel <info@artsoft.org>
+# (c) 1995-2015 by Artsoft Entertainment
+#                  Holger Schemel
+#                  info@artsoft.org
+#                  http://www.artsoft.org/
+# -----------------------------------------------------------------------------
+# Makefile
 # =============================================================================
 
 # -----------------------------------------------------------------------------
@@ -16,9 +21,6 @@ CC = gcc
 # (this must be set to "gmake" for some systems)
 MAKE = make
 
-# path to X11 on your system
-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
@@ -41,13 +43,9 @@ X11_PATH = /usr/X11R6
 # uncomment to install game in single-user environment (default)
 # SCORE_ENTRIES = MANY_PER_NAME
 
-# paths for cross-compiling (only needed for non-native MS-DOS and Win32 build)
-CROSS_PATH_MSDOS = /usr/local/cross-msdos/i386-msdosdjgpp
+# 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
@@ -58,19 +56,13 @@ CROSS_PATH_WIN32 = /usr/local/cross-tools/i386-mingw32msvc
 SRC_DIR = src
 MAKE_CMD = $(MAKE) -C $(SRC_DIR)
 
-# DEFAULT_TARGET = x11
-DEFAULT_TARGET = sdl2
-
 
 # -----------------------------------------------------------------------------
 # build targets
 # -----------------------------------------------------------------------------
 
 all:
-       @$(MAKE_CMD) TARGET=$(DEFAULT_TARGET)
-
-x11:
-       @$(MAKE_CMD) TARGET=x11
+       @$(MAKE_CMD)
 
 sdl:
        @$(MAKE_CMD) TARGET=sdl
@@ -78,33 +70,18 @@ sdl:
 sdl2:
        @$(MAKE_CMD) TARGET=sdl2
 
-solaris:
-       @$(MAKE_CMD) PLATFORM=solaris TARGET=x11
-
-solaris-sdl:
-       @$(MAKE_CMD) PLATFORM=solaris TARGET=sdl
-
 mac:
        @$(MAKE_CMD) PLATFORM=macosx
 
-mac-static:
-       @$(MAKE_CMD) PLATFORM=macosx TARGET=sdl-static
-
-msdos:
-       @$(MAKE_CMD) PLATFORM=msdos
-
-os2:
-       @$(MAKE_CMD) PLATFORM=os2
-
-cross-msdos:
-       @PATH=$(CROSS_PATH_MSDOS)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-msdos
-
 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
@@ -157,20 +134,11 @@ 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
 
 dist-build-unix:
-       @BUILD_DIST=TRUE $(MAKE) x11
-
-dist-build-msdos:
-       @BUILD_DIST=TRUE $(MAKE) cross-msdos
+       @BUILD_DIST=TRUE $(MAKE)
 
 dist-build-win32:
        @BUILD_DIST=TRUE $(MAKE) cross-win32
@@ -184,9 +152,6 @@ dist-build-macosx-ppc:
 dist-package-unix:
        ./Scripts/make_dist.sh unix .
 
-dist-package-msdos:
-       ./Scripts/make_dist.sh dos .
-
 dist-package-win32:
        ./Scripts/make_dist.sh win .
 
@@ -199,9 +164,6 @@ dist-package-macosx-ppc:
 dist-upload-unix:
        ./Scripts/make_dist.sh unix . upload
 
-dist-upload-msdos:
-       ./Scripts/make_dist.sh dos . upload
-
 dist-upload-win32:
        ./Scripts/make_dist.sh win . upload
 
@@ -215,21 +177,18 @@ dist-build-all:
        $(MAKE) clean
        $(MAKE) dist-build-unix         ; $(MAKE) dist-clean
        $(MAKE) dist-build-win32        ; $(MAKE) dist-clean
-#      $(MAKE) dist-build-msdos        ; $(MAKE) dist-clean
 
 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
 
@@ -239,4 +198,4 @@ tags:
        $(MAKE_CMD) tags
 
 depend dep:
-       $(MAKE_CMD) TARGET=$(DEFAULT_TARGET) depend
+       $(MAKE_CMD) depend