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

diff --git a/Makefile b/Makefile
index 10909b96..74814455 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #=============================================================================#
-# Makefile for Rocks'n'Diamonds 1.4.0                                         #
-# (c) 1995-1999 Holger Schemel, aeglos@valinor.owl.de                         #
+# Makefile for Rocks'n'Diamonds                                               #
+# (c) 1995-2000 Holger Schemel, info@artsoft.org                              #
 #=============================================================================#
 
 #-----------------------------------------------------------------------------#
@@ -10,13 +10,6 @@
 # specify your favorite ANSI C compiler
 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 path to X11 on your system
 # if undefined, use system defaults (works with Linux/gcc/libc5)
 X11_PATH = /usr/X11
@@ -32,9 +25,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 +32,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                                #
@@ -57,7 +48,7 @@ SRC_DIR = src
 MAKE_CMD = $(MAKE) -C $(SRC_DIR)
 
 all:
-	@$(MAKE_CMD) TARGET=sdl
+	@$(MAKE_CMD) TARGET=x11
 
 x11:
 	@$(MAKE_CMD) TARGET=x11
@@ -65,14 +56,60 @@ x11:
 sdl:
 	@$(MAKE_CMD) TARGET=sdl
 
-sdl_old:
-	@$(MAKE_CMD) TARGET=sdl_old_10
-
 solaris:
-	@$(MAKE_CMD) PLATFORM=solaris
+	@$(MAKE_CMD) PLATFORM=solaris TARGET=x11
+
+solaris-sdl:
+	@$(MAKE_CMD) PLATFORM=solaris TARGET=sdl
 
-windows:
-	@PATH=$(CROSS_PATH):${PATH} $(MAKE_CMD) PLATFORM=windows
+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
+
+
+#-----------------------------------------------------------------------------#
+# development only stuff                                                      #
+#-----------------------------------------------------------------------------#
+
+run:
+	@$(MAKE_CMD) TARGET=x11 && ./rocksndiamonds --verbose
+
+backup:
+	./Scripts/make_backup.sh src
+
+backup_lev:
+	./Scripts/make_backup.sh lev
+
+backup_gfx:
+	./Scripts/make_backup.sh gfx
+
+dist-unix:
+	./Scripts/make_dist.sh unix .
+
+dist-msdos:
+	./Scripts/make_dist.sh dos .
+
+dist-win32:
+	./Scripts/make_dist.sh win .
+
+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
+
+depend dep:
+	$(MAKE_CMD) depend