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

diff --git a/Makefile b/Makefile
index 2ea6579c..74814455 100644
--- a/Makefile
+++ b/Makefile
@@ -25,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
@@ -35,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 Win32 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                                #
@@ -50,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
@@ -59,13 +57,19 @@ sdl:
 	@$(MAKE_CMD) TARGET=sdl
 
 solaris:
-	@$(MAKE_CMD) PLATFORM=solaris
+	@$(MAKE_CMD) PLATFORM=solaris TARGET=x11
+
+solaris-sdl:
+	@$(MAKE_CMD) PLATFORM=solaris TARGET=sdl
 
 msdos:
 	@$(MAKE_CMD) PLATFORM=msdos
 
-win32:
-	@PATH=$(CROSS_PATH):${PATH} $(MAKE_CMD) PLATFORM=win32
+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
@@ -75,6 +79,9 @@ clean:
 # development only stuff                                                      #
 #-----------------------------------------------------------------------------#
 
+run:
+	@$(MAKE_CMD) TARGET=x11 && ./rocksndiamonds --verbose
+
 backup:
 	./Scripts/make_backup.sh src
 
@@ -90,7 +97,19 @@ dist-unix:
 dist-msdos:
 	./Scripts/make_dist.sh dos .
 
-dist: dist-unix dist-msdos
+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