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

diff --git a/Makefile b/Makefile
index d8c400de..93533d6d 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@ 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)
@@ -41,6 +42,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
+
 #-----------------------------------------------------------------------------#
 # you should not need to change anything below                                #
 #-----------------------------------------------------------------------------#
@@ -50,13 +54,50 @@ X11_PATH = /usr/X11
 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
+
+
+#-----------------------------------------------------------------------------#
+# development only stuff                                                      #
+#-----------------------------------------------------------------------------#
+
+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-dos:
+	./Scripts/make_dist.sh dos .
+
+dist: dist-unix dist-dos
+
+depend dep:
+	$(MAKE_CMD) depend