X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=Makefile;h=bdd285b5e775938c501bd4dd53fd57723470f574;hp=78eb6ea087c6d33cf0982fafc7403009c8aeb7bf;hb=4386c0ac1665619412148f1eb907f6d366a70d7d;hpb=6cac6fc05528a4de065de5fc58ac51157b3e6c30

diff --git a/Makefile b/Makefile
index 78eb6ea0..bdd285b5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,22 @@
 #=============================================================================#
 # Makefile for Rocks'n'Diamonds                                               #
-# (c) 1995-2000 Holger Schemel, info@artsoft.org                              #
+# (c) 1995-2002 Holger Schemel, info@artsoft.org                              #
 #=============================================================================#
 
 #-----------------------------------------------------------------------------#
 # configuration section                                                       #
 #-----------------------------------------------------------------------------#
 
-# specify your favorite ANSI C compiler
+# specify command name of your favorite ANSI C compiler
+# (this must be set to "cc" for some systems)
 CC = gcc
 
+# specify command name of GNU make on your system
+# (this must be set to "gmake" for some systems)
+MAKE = make
+
 # specify path to X11 on your system
-# if undefined, use system defaults (works with Linux/gcc/libc5)
-X11_PATH = /usr/X11
+X11_PATH = /usr/X11R6
 
 # specify directory for read-only game data (like graphics, sounds, levels)
 # default is '.', so you can play without installing game data somewhere
@@ -42,13 +46,14 @@ CROSS_PATH_WIN32=/usr/local/cross-tools/i386-mingw32msvc
 
 .EXPORT_ALL_VARIABLES:
 
-MAKE = make
-
 SRC_DIR = src
 MAKE_CMD = $(MAKE) -C $(SRC_DIR)
 
+DEFAULT_TARGET = x11
+# DEFAULT_TARGET = sdl
+
 all:
-	@$(MAKE_CMD) TARGET=x11
+	@$(MAKE_CMD) TARGET=$(DEFAULT_TARGET)
 
 x11:
 	@$(MAKE_CMD) TARGET=x11
@@ -57,7 +62,13 @@ sdl:
 	@$(MAKE_CMD) TARGET=sdl
 
 solaris:
-	@$(MAKE_CMD) PLATFORM=solaris
+	@$(MAKE_CMD) PLATFORM=solaris TARGET=x11
+
+solaris-sdl:
+	@$(MAKE_CMD) PLATFORM=solaris TARGET=sdl
+
+mac:
+	@$(MAKE_CMD) PLATFORM=macosx
 
 msdos:
 	@$(MAKE_CMD) PLATFORM=msdos
@@ -76,6 +87,21 @@ clean:
 # development only stuff                                                      #
 #-----------------------------------------------------------------------------#
 
+auto-conf:
+	@$(MAKE_CMD) auto-conf
+
+run:
+	@$(MAKE_CMD) TARGET=$(DEFAULT_TARGET) && ./rocksndiamonds --verbose
+
+gdb:
+	@$(MAKE_CMD) TARGET=$(DEFAULT_TARGET) && gdb ./rocksndiamonds
+
+enginetest:
+	./Scripts/make_enginetest.sh
+
+enginetestfast:
+	./Scripts/make_enginetest.sh fast
+
 backup:
 	./Scripts/make_backup.sh src
 
@@ -94,7 +120,42 @@ dist-msdos:
 dist-win32:
 	./Scripts/make_dist.sh win .
 
-dist: dist-unix dist-msdos dist-win32
+dist-macosx:
+	./Scripts/make_dist.sh mac . $(MAKE)
+
+upload-unix:
+	./Scripts/make_dist.sh unix . upload
+
+upload-msdos:
+	./Scripts/make_dist.sh dos . upload
+
+upload-win32:
+	./Scripts/make_dist.sh win . upload
+
+upload-macosx:
+	./Scripts/make_dist.sh mac . upload
+
+dist-clean:
+	@$(MAKE_CMD) dist-clean
+
+dist-build-unix:
+	@BUILD_DIST=TRUE $(MAKE) x11
+
+dist-build-win32:
+	@BUILD_DIST=TRUE $(MAKE) cross-win32
+
+dist-build-msdos:
+	@BUILD_DIST=TRUE $(MAKE) cross-msdos
+
+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-all: dist-build-all dist-unix dist-msdos dist-win32 dist-macosx
+
+upload-all: upload-unix upload-msdos upload-win32 upload-macosx
 
 depend dep:
 	$(MAKE_CMD) depend