X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=Makefile;h=96b73c56520626702994a3b00c6a0a38ffb3175d;hb=fffaec4e69e54c74cf5eea689191e81b8c19b85a;hp=74814455f1904c82c1a172cda2649a680c14cb33;hpb=2443a8a09966a9940e1420c91d24a297325c2a00;p=rocksndiamonds.git

diff --git a/Makefile b/Makefile
index 74814455..96b73c56 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,13 @@ 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 = sdl
+
 all:
-	@$(MAKE_CMD) TARGET=x11
+	@$(MAKE_CMD) TARGET=$(DEFAULT_TARGET)
 
 x11:
 	@$(MAKE_CMD) TARGET=x11
@@ -62,6 +66,9 @@ solaris:
 solaris-sdl:
 	@$(MAKE_CMD) PLATFORM=solaris TARGET=sdl
 
+mac:
+	@$(MAKE_CMD) PLATFORM=macosx
+
 msdos:
 	@$(MAKE_CMD) PLATFORM=msdos
 
@@ -80,7 +87,7 @@ clean:
 #-----------------------------------------------------------------------------#
 
 run:
-	@$(MAKE_CMD) TARGET=x11 && ./rocksndiamonds --verbose
+	@$(MAKE_CMD) TARGET=$(DEFAULT_TARGET) && ./rocksndiamonds --verbose
 
 backup:
 	./Scripts/make_backup.sh src
@@ -100,6 +107,21 @@ dist-msdos:
 dist-win32:
 	./Scripts/make_dist.sh win .
 
+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
 
@@ -109,7 +131,9 @@ dist-build-all:
 	@BUILD_DIST=TRUE $(MAKE) cross-win32	; $(MAKE) dist-clean
 	@BUILD_DIST=TRUE $(MAKE) cross-msdos	; $(MAKE) dist-clean
 
-dist-all: dist-build-all dist-unix dist-msdos dist-win32
+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