X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=1ea92b071143a8f34b3ef39b687194fc893a8a00;hb=ed22fcb49eb39c34da82c51f44cbe64ca5b409c4;hp=e981e70506d99f91646b174f917d954e1124a720;hpb=39af00f43cf5c4cea174d0e90633877df08a2f7c;p=rocksndiamonds.git

diff --git a/Makefile b/Makefile
index e981e705..1ea92b07 100644
--- a/Makefile
+++ b/Makefile
@@ -50,8 +50,8 @@ CROSS_PATH_WIN32=/usr/local/cross-tools/i386-mingw32msvc
 SRC_DIR = src
 MAKE_CMD = $(MAKE) -C $(SRC_DIR)
 
-# DEFAULT_TARGET = x11
-DEFAULT_TARGET = sdl
+DEFAULT_TARGET = x11
+# DEFAULT_TARGET = sdl
 
 
 # -----------------------------------------------------------------------------
@@ -79,6 +79,9 @@ mac:
 msdos:
 	@$(MAKE_CMD) PLATFORM=msdos
 
+os2:
+	@$(MAKE_CMD) PLATFORM=os2
+
 cross-msdos:
 	@PATH=$(CROSS_PATH_MSDOS)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-msdos
 
@@ -96,19 +99,22 @@ clean:
 auto-conf:
 	@$(MAKE_CMD) auto-conf
 
-run:
-	@$(MAKE_CMD) TARGET=$(DEFAULT_TARGET) && ./rocksndiamonds --verbose
+run: all
+	@./rocksndiamonds --verbose
 
-gdb:
-	@$(MAKE_CMD) TARGET=$(DEFAULT_TARGET) && gdb ./rocksndiamonds
+gdb: all
+	@gdb ./rocksndiamonds
 
-valgrind:
-	valgrind -v --leak-check=yes ./rocksndiamonds 2> valgrind.out
+valgrind: all
+	@valgrind -v --leak-check=yes ./rocksndiamonds 2> valgrind.out
 
-enginetest:
+enginetest: all
 	./Scripts/make_enginetest.sh
 
-enginetestfast:
+enginetestcustom: all
+	./Scripts/make_enginetest.sh custom
+
+enginetestfast: all
 	./Scripts/make_enginetest.sh fast
 
 backup: