X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=Makefile;h=a5b3d976bc18c017122120838fca0ac01a041943;hb=6ed4958820f8f97174ca47594dcc6f00ee31b2cb;hp=93533d6d2b73778412439b0fda863c1c4660c195;hpb=8be31c2781126204470171aff7af45713ec42e9e;p=rocksndiamonds.git

diff --git a/Makefile b/Makefile
index 93533d6d..a5b3d976 100644
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,22 @@
 #=============================================================================#
-# Makefile for Rocks'n'Diamonds 1.4.0                                         #
-# (c) 1995-1999 Holger Schemel, aeglos@valinor.owl.de                         #
+# Makefile for Rocks'n'Diamonds                                               #
+# (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
 
-# explicitely choose your platform, if defaults doesn't work right
-# needed for SUN/Solaris; Linux and DOS work fine with auto detection
-# PLATFORM = solaris
-# PLATFORM = unix
-# PLATFORM = dos
-# PLATFORM = windows
+# 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
@@ -32,9 +29,6 @@ X11_PATH = /usr/X11
 # uncomment this if your system has no joystick include file
 # JOYSTICK = -DNO_JOYSTICK
 
-# uncomment this if your system has no sound
-# SOUNDS = -DNO_SOUNDS
-
 # 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
@@ -42,8 +36,9 @@ X11_PATH = /usr/X11
 # when installing the game in a single user environment, choose this
 # SCORE_ENTRIES = MANY_PER_NAME
 
-# specify path for cross-compiling (only needed for Windows build)
-CROSS_PATH=/usr/local/cross-tools/i386-mingw32/bin
+# specify paths for cross-compiling (only needed for 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                                #
@@ -51,13 +46,14 @@ CROSS_PATH=/usr/local/cross-tools/i386-mingw32/bin
 
 .EXPORT_ALL_VARIABLES:
 
-MAKE = make
-
 SRC_DIR = src
 MAKE_CMD = $(MAKE) -C $(SRC_DIR)
 
+DEFAULT_TARGET = x11
+# DEFAULT_TARGET = sdl
+
 all:
-	@$(MAKE_CMD) TARGET=sdl
+	@$(MAKE_CMD) TARGET=$(DEFAULT_TARGET)
 
 x11:
 	@$(MAKE_CMD) TARGET=x11
@@ -65,14 +61,23 @@ x11:
 sdl:
 	@$(MAKE_CMD) TARGET=sdl
 
-sdl_old:
-	@$(MAKE_CMD) TARGET=sdl USE_SDL_OLD_LIBS=true
-
 solaris:
-	@$(MAKE_CMD) PLATFORM=solaris
+	@$(MAKE_CMD) PLATFORM=solaris TARGET=x11
 
-windows:
-	@PATH=$(CROSS_PATH):${PATH} $(MAKE_CMD) PLATFORM=windows
+solaris-sdl:
+	@$(MAKE_CMD) PLATFORM=solaris TARGET=sdl
+
+mac:
+	@$(MAKE_CMD) PLATFORM=macosx
+
+msdos:
+	@$(MAKE_CMD) PLATFORM=msdos
+
+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
@@ -82,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,10 +114,39 @@ backup_gfx:
 dist-unix:
 	./Scripts/make_dist.sh unix .
 
-dist-dos:
+dist-msdos:
 	./Scripts/make_dist.sh dos .
 
-dist: dist-unix dist-dos
+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-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
+
+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