X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=Makefile;h=d5a21886056fd8d7d6048bd14295a3ea87866427;hb=d0d2411a139b4ff6c5f9d2ba1df723ffbb0beeb8;hp=d80dcb5796b102b50930dcd7c94df92e05c664c1;hpb=959794cfda1f83edc51512211ae5a9f6b1e0b179;p=rocksndiamonds.git

diff --git a/Makefile b/Makefile
index d80dcb57..d5a21886 100644
--- 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-2014 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
@@ -57,19 +59,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
@@ -77,23 +73,11 @@ 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
-
-mac2-static:
-	@$(MAKE_CMD) PLATFORM=macosx TARGET=sdl2-static
-
-os2:
-	@$(MAKE_CMD) PLATFORM=os2
+	@$(MAKE_CMD) PLATFORM=macosx STATIC=true
 
 cross-win32:
 	@PATH=$(CROSS_PATH_WIN32)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-win32
@@ -101,6 +85,9 @@ cross-win32:
 clean:
 	@$(MAKE_CMD) clean
 
+clean-git:
+	@$(MAKE_CMD) clean-git
+
 
 # -----------------------------------------------------------------------------
 # development, test, distribution build and packaging targets
@@ -223,4 +210,4 @@ tags:
 	$(MAKE_CMD) tags
 
 depend dep:
-	$(MAKE_CMD) TARGET=$(DEFAULT_TARGET) depend
+	$(MAKE_CMD) depend