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

diff --git a/Makefile b/Makefile
index d1bc33a8..93533d6d 100644
--- a/Makefile
+++ b/Makefile
@@ -15,10 +15,11 @@ CC = gcc
 # 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
+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
@@ -41,6 +42,9 @@ CC = gcc
 # 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
+
 #-----------------------------------------------------------------------------#
 # you should not need to change anything below                                #
 #-----------------------------------------------------------------------------#
@@ -50,16 +54,28 @@ 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=sdl
+
+x11:
+	@$(MAKE_CMD) TARGET=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
+
+windows:
+	@PATH=$(CROSS_PATH):${PATH} $(MAKE_CMD) PLATFORM=windows
 
 clean:
-	$(MAKE_CMD) clean
+	@$(MAKE_CMD) clean
 
 
 #-----------------------------------------------------------------------------#
@@ -83,5 +99,5 @@ dist-dos:
 
 dist: dist-unix dist-dos
 
-depend:
+depend dep:
 	$(MAKE_CMD) depend