X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=Makefile;h=69fbf226a8305e0aae3ec98533917107999b05c5;hp=3e9427cb4678c352108f36710ef06de2700008cf;hb=HEAD;hpb=b3ca289b09b8a2ab1436f865f6bf6a42a7e18d87

diff --git a/Makefile b/Makefile
index 3e9427cb..a8213040 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # (c) 1995-2015 by Artsoft Entertainment
 #                  Holger Schemel
 #                  info@artsoft.org
-#                  http://www.artsoft.org/
+#                  https://www.artsoft.org/
 # -----------------------------------------------------------------------------
 # Makefile
 # =============================================================================
@@ -21,19 +21,12 @@ CC = gcc
 # (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
-# RO_GAME_DIR = .
+# BASE_PATH = .
 # 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
@@ -80,6 +73,9 @@ android-clean:
 
 android: android-package
 
+emscripten:
+	@emmake $(MAKE_CMD) PLATFORM=emscripten
+
 clean:
 	@$(MAKE_CMD) clean
 
@@ -93,7 +89,7 @@ clean-android: android-clean
 # development targets
 # -----------------------------------------------------------------------------
 
-MAKE_ENGINETEST = ./Scripts/make_enginetest.sh
+MAKE_ENGINETEST = ./tests/enginetest/enginetest.sh
 MAKE_LEVELSKETCH = ./Scripts/make_levelsketch_images.sh
 
 auto-conf:
@@ -102,6 +98,9 @@ auto-conf:
 conf-time:
 	@$(MAKE_CMD) conf-time
 
+conf-hash:
+	@$(MAKE_CMD) conf-hash
+
 run: all
 	@$(MAKE_CMD) run
 
@@ -120,18 +119,6 @@ depend dep:
 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)
 
@@ -163,6 +150,9 @@ dist-build-mac:
 dist-build-android:
 	@BUILD_DIST=TRUE $(MAKE) android
 
+dist-build-emscripten:
+	@BUILD_DIST=TRUE $(MAKE) emscripten
+
 dist-package-linux:
 	$(MAKE_DIST) package linux
 
@@ -178,6 +168,9 @@ dist-package-mac:
 dist-package-android:
 	$(MAKE_DIST) package android
 
+dist-package-emscripten:
+	$(MAKE_DIST) package emscripten
+
 dist-copy-package-linux:
 	$(MAKE_DIST) copy-package linux
 
@@ -193,6 +186,9 @@ dist-copy-package-mac:
 dist-copy-package-android:
 	$(MAKE_DIST) copy-package android
 
+dist-copy-package-emscripten:
+	$(MAKE_DIST) copy-package emscripten
+
 dist-upload-linux:
 	$(MAKE_DIST) upload linux
 
@@ -208,12 +204,19 @@ dist-upload-mac:
 dist-upload-android:
 	$(MAKE_DIST) upload android
 
+dist-upload-emscripten:
+	$(MAKE_DIST) upload emscripten
+
+dist-deploy-emscripten:
+	$(MAKE_DIST) deploy emscripten
+
 dist-package-all:
 	$(MAKE) dist-package-linux
 	$(MAKE) dist-package-win32
 	$(MAKE) dist-package-win64
 	$(MAKE) dist-package-mac
 	$(MAKE) dist-package-android
+	$(MAKE) dist-package-emscripten
 
 dist-copy-package-all:
 	$(MAKE) dist-copy-package-linux
@@ -221,6 +224,7 @@ dist-copy-package-all:
 	$(MAKE) dist-copy-package-win64
 	$(MAKE) dist-copy-package-mac
 	$(MAKE) dist-copy-package-android
+	$(MAKE) dist-copy-package-emscripten
 
 dist-upload-all:
 	$(MAKE) dist-upload-linux
@@ -228,8 +232,12 @@ dist-upload-all:
 	$(MAKE) dist-upload-win64
 	$(MAKE) dist-upload-mac
 	$(MAKE) dist-upload-android
+	$(MAKE) dist-upload-emscripten
 
-dist-release-all: dist-package-all dist-copy-package-all dist-upload-all
+dist-deploy-all:
+	$(MAKE) dist-deploy-emscripten
+
+dist-release-all: dist-package-all dist-copy-package-all dist-upload-all dist-deploy-all
 
 package-all: dist-package-all
 
@@ -237,4 +245,6 @@ copy-package-all: dist-copy-package-all
 
 upload-all: dist-upload-all
 
+deploy-all: dist-deploy-all
+
 release-all: dist-release-all