X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=Makefile;h=bdd285b5e775938c501bd4dd53fd57723470f574;hb=ddaae9de458b7f07b05461101655a1da4c63b380;hp=f4921768319dae2ee6a07e5b020a069d7cab3f18;hpb=b13dc8e30a0c07bea53bf168ae6d1017394d3c22;p=rocksndiamonds.git

diff --git a/Makefile b/Makefile
index f4921768..bdd285b5 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,8 @@ CROSS_PATH_WIN32=/usr/local/cross-tools/i386-mingw32msvc
 SRC_DIR = src
 MAKE_CMD = $(MAKE) -C $(SRC_DIR)
 
-DEFAULT_TARGET = sdl
+DEFAULT_TARGET = x11
+# DEFAULT_TARGET = sdl
 
 all:
 	@$(MAKE_CMD) TARGET=$(DEFAULT_TARGET)
@@ -86,12 +87,21 @@ clean:
 # development only stuff                                                      #
 #-----------------------------------------------------------------------------#
 
+auto-conf:
+	@$(MAKE_CMD) auto-conf
+
 run:
 	@$(MAKE_CMD) TARGET=$(DEFAULT_TARGET) && ./rocksndiamonds --verbose
 
 gdb:
 	@$(MAKE_CMD) TARGET=$(DEFAULT_TARGET) && gdb ./rocksndiamonds
 
+enginetest:
+	./Scripts/make_enginetest.sh
+
+enginetestfast:
+	./Scripts/make_enginetest.sh fast
+
 backup:
 	./Scripts/make_backup.sh src
 
@@ -128,11 +138,20 @@ upload-macosx:
 dist-clean:
 	@$(MAKE_CMD) dist-clean
 
+dist-build-unix:
+	@BUILD_DIST=TRUE $(MAKE) x11
+
+dist-build-win32:
+	@BUILD_DIST=TRUE $(MAKE) cross-win32
+
+dist-build-msdos:
+	@BUILD_DIST=TRUE $(MAKE) cross-msdos
+
 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
+	$(MAKE) dist-build-unix		; $(MAKE) dist-clean
+	$(MAKE) dist-build-win32	; $(MAKE) dist-clean
+	$(MAKE) dist-build-msdos	; $(MAKE) dist-clean
 
 dist-all: dist-build-all dist-unix dist-msdos dist-win32 dist-macosx