X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=Makefile;h=e058339a40bac9af41053072f94398e98e231dc5;hb=c4e1a476135ce36417cdd797481feeaaff4301af;hp=d1bc33a88cd5de0f12740b02e3587fd2313db003;hpb=c8dd3c1abd6a1daf4f7431a59db721ae7fba3d17;p=rocksndiamonds.git

diff --git a/Makefile b/Makefile
index d1bc33a8..e058339a 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,15 +10,9 @@
 # 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
-
 # specify path to X11 on your system
 # if undefined, use system defaults (works with Linux/gcc/libc5)
-# X11_PATH = /usr/X11
+X11_PATH = /usr/X11
 
 # specify directory for read-only game data (like graphics, sounds, levels)
 # default is '.', so you can play without installing game data somewhere
@@ -31,9 +25,6 @@ CC = gcc
 # 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
@@ -41,6 +32,10 @@ CC = gcc
 # when installing the game in a single user environment, choose this
 # SCORE_ENTRIES = MANY_PER_NAME
 
+# 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                                #
 #-----------------------------------------------------------------------------#
@@ -50,16 +45,31 @@ CC = gcc
 MAKE = make
 
 SRC_DIR = src
-MAKE_CMD = @$(MAKE) -C $(SRC_DIR)
+MAKE_CMD = $(MAKE) -C $(SRC_DIR)
 
 all:
-	$(MAKE_CMD)
+	@$(MAKE_CMD) TARGET=x11
+
+x11:
+	@$(MAKE_CMD) TARGET=x11
+
+sdl:
+	@$(MAKE_CMD) TARGET=sdl
 
 solaris:
-	$(MAKE_CMD) PLATFORM=solaris
+	@$(MAKE_CMD) PLATFORM=solaris
+
+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
+	@$(MAKE_CMD) clean
 
 
 #-----------------------------------------------------------------------------#
@@ -78,10 +88,10 @@ backup_gfx:
 dist-unix:
 	./Scripts/make_dist.sh unix .
 
-dist-dos:
+dist-msdos:
 	./Scripts/make_dist.sh dos .
 
-dist: dist-unix dist-dos
+dist: dist-unix dist-msdos
 
-depend:
+depend dep:
 	$(MAKE_CMD) depend