added optional button to restart game (door, panel and touch variants)

[rocksndiamonds.git] / Makefile

diff --git a/Makefile b/Makefile
index ae6b318d4c73c45706a88eb7d617e335fed18045..a821304008dc5a51a27c376f8fcef6e44a740612 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,19 +21,12 @@ CC = gcc
 # (this must be set to "gmake" for some systems)
 MAKE = make
 
 # (this must be set to "gmake" for some systems)
 MAKE = make
 

-# directory for read-only game data (like graphics, sounds, levels)
+# directory for (read-only) game data (like graphics, sounds, levels)

 # (this directory is usually the game's installation directory)
 # default is '.' to be able to run program without installation
 # (this directory is usually the game's installation directory)
 # default is '.' to be able to run program without installation

-# RO_GAME_DIR = .
+# BASE_PATH = .

 # use the following setting for Debian / Ubuntu installations:
 # use the following setting for Debian / Ubuntu installations:

-# RO_GAME_DIR = /usr/share/games/rocksndiamonds
-
-# directory for writable game data (like highscore files)
-# (if no "scores" directory exists, scores are saved in user data directory)
-# default is '.' to be able to run program without installation
-# RW_GAME_DIR = .
-# use the following setting for Debian / Ubuntu installations:
-# RW_GAME_DIR = /var/games/rocksndiamonds
+# BASE_PATH = /usr/share/games/rocksndiamonds

 
 # uncomment if system has no joystick include file
 # JOYSTICK = -DNO_JOYSTICK
 
 # uncomment if system has no joystick include file
 # JOYSTICK = -DNO_JOYSTICK


@@ -96,7 +89,7 @@ clean-android: android-clean
 # development targets
 # -----------------------------------------------------------------------------
 
 # development targets
 # -----------------------------------------------------------------------------
 

-MAKE_ENGINETEST = ./Scripts/make_enginetest.sh
+MAKE_ENGINETEST = ./tests/enginetest/enginetest.sh

 MAKE_LEVELSKETCH = ./Scripts/make_levelsketch_images.sh
 
 auto-conf:
 MAKE_LEVELSKETCH = ./Scripts/make_levelsketch_images.sh
 
 auto-conf:


@@ -126,18 +119,6 @@ depend dep:
 enginetest: all
        $(MAKE_ENGINETEST)
 
 enginetest: all
        $(MAKE_ENGINETEST)
 

-enginetestcustom: all
-       $(MAKE_ENGINETEST) custom
-
-enginetestfast: all
-       $(MAKE_ENGINETEST) fast
-
-enginetestnew: all
-       $(MAKE_ENGINETEST) new
-
-leveltest: all
-       $(MAKE_ENGINETEST) leveltest
-

 levelsketch_images: all
        $(MAKE_LEVELSKETCH)
 
 levelsketch_images: all
        $(MAKE_LEVELSKETCH)
 


@@ -256,7 +237,7 @@ dist-upload-all:
 dist-deploy-all:
        $(MAKE) dist-deploy-emscripten
 
 dist-deploy-all:
        $(MAKE) dist-deploy-emscripten
 

-dist-release-all: dist-package-all dist-copy-package-all dist-upload-all
+dist-release-all: dist-package-all dist-copy-package-all dist-upload-all dist-deploy-all

 
 package-all: dist-package-all
 
 
 package-all: dist-package-all