X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=Makefile;h=e981e70506d99f91646b174f917d954e1124a720;hb=39af00f43cf5c4cea174d0e90633877df08a2f7c;hp=3794cd878840e9bb6928fe6e8690ea0dc2dcdf2e;hpb=efd0d0abb853018aa3ccc3c727b39bd7f5ba679d;p=rocksndiamonds.git

diff --git a/Makefile b/Makefile
index 3794cd87..e981e705 100644
--- a/Makefile
+++ b/Makefile
@@ -1,54 +1,65 @@
-#=============================================================================#
-# Makefile for Rocks'n'Diamonds                                               #
-# (c) 1995-2000 Holger Schemel, info@artsoft.org                              #
-#=============================================================================#
-
-#-----------------------------------------------------------------------------#
-# configuration section                                                       #
-#-----------------------------------------------------------------------------#
-
-# specify your favorite ANSI C compiler
+# =============================================================================
+# Rocks'n'Diamonds Makefile
+# -----------------------------------------------------------------------------
+# (c) 1995-2003 Holger Schemel <info@artsoft.org>
+# =============================================================================
+
+# -----------------------------------------------------------------------------
+# configuration
+# -----------------------------------------------------------------------------
+
+# command name of your favorite ANSI C compiler
+# (this must be set to "cc" for some systems)
 CC = gcc
 
-# specify path to X11 on your system
-# if undefined, use system defaults (works with Linux/gcc/libc5)
-X11_PATH = /usr/X11
+# command name of GNU make on your system
+# (this must be set to "gmake" for some systems)
+MAKE = make
+
+# path to X11 on your system
+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
+# 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
 
-# specify directory for writable game data (like highscore files)
-# default is '.', so you can play without installing game data somewhere
+# directory for writable game data (like highscore files)
+# default is '.' to be able to run program without installation
 # RW_GAME_DIR = /var/games
 
-# uncomment this if your system has no joystick include file
+# uncomment if system has no joystick include file
 # JOYSTICK = -DNO_JOYSTICK
 
-# choose if you want to allow many global score file entries for one player
-# default is 'MANY_PER_NAME'
-# when installing the game in a multi user environment, choose this
+# choose if more than one global score file entry for one player is allowed
+# (default: MANY_PER_NAME)
+# uncomment to install game in multi-user environment
 # SCORE_ENTRIES = ONE_PER_NAME
-# when installing the game in a single user environment, choose this
+# uncomment to install game in single-user environment (default)
 # SCORE_ENTRIES = MANY_PER_NAME
 
-# specify paths for cross-compiling (only needed for MS-DOS and Win32 build)
+# paths for cross-compiling (only needed for non-native MS-DOS and Win32 build)
 CROSS_PATH_MSDOS=/usr/local/cross-msdos/i386-msdosdjgpp
 CROSS_PATH_WIN32=/usr/local/cross-tools/i386-mingw32msvc
 
-#-----------------------------------------------------------------------------#
-# you should not need to change anything below                                #
-#-----------------------------------------------------------------------------#
+# -----------------------------------------------------------------------------
+# there should be no need to change anything below
+# -----------------------------------------------------------------------------
 
 .EXPORT_ALL_VARIABLES:
 
-MAKE = make
-
 SRC_DIR = src
 MAKE_CMD = $(MAKE) -C $(SRC_DIR)
 
+# DEFAULT_TARGET = x11
+DEFAULT_TARGET = sdl
+
+
+# -----------------------------------------------------------------------------
+# build targets
+# -----------------------------------------------------------------------------
+
 all:
-	@$(MAKE_CMD) TARGET=x11
+	@$(MAKE_CMD) TARGET=$(DEFAULT_TARGET)
 
 x11:
 	@$(MAKE_CMD) TARGET=x11
@@ -62,6 +73,9 @@ solaris:
 solaris-sdl:
 	@$(MAKE_CMD) PLATFORM=solaris TARGET=sdl
 
+mac:
+	@$(MAKE_CMD) PLATFORM=macosx
+
 msdos:
 	@$(MAKE_CMD) PLATFORM=msdos
 
@@ -75,9 +89,27 @@ clean:
 	@$(MAKE_CMD) clean
 
 
-#-----------------------------------------------------------------------------#
-# development only stuff                                                      #
-#-----------------------------------------------------------------------------#
+# -----------------------------------------------------------------------------
+# development only
+# -----------------------------------------------------------------------------
+
+auto-conf:
+	@$(MAKE_CMD) auto-conf
+
+run:
+	@$(MAKE_CMD) TARGET=$(DEFAULT_TARGET) && ./rocksndiamonds --verbose
+
+gdb:
+	@$(MAKE_CMD) TARGET=$(DEFAULT_TARGET) && gdb ./rocksndiamonds
+
+valgrind:
+	valgrind -v --leak-check=yes ./rocksndiamonds 2> valgrind.out
+
+enginetest:
+	./Scripts/make_enginetest.sh
+
+enginetestfast:
+	./Scripts/make_enginetest.sh fast
 
 backup:
 	./Scripts/make_backup.sh src
@@ -97,16 +129,42 @@ 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
 
+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
-	@BUILD_DIST=TRUE $(MAKE) x11		; $(MAKE) dist-clean
-	@BUILD_DIST=TRUE $(MAKE) cross-win32	; $(MAKE) dist-clean
-	@BUILD_DIST=TRUE $(MAKE) cross-msdos	; $(MAKE) dist-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
 
-dist-all: dist-build-all dist-unix dist-msdos dist-win32
+upload-all: upload-unix upload-msdos upload-win32 upload-macosx
 
 depend dep:
 	$(MAKE_CMD) depend