X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=Makefile;h=69fbf226a8305e0aae3ec98533917107999b05c5;hp=308f0c9523513a0b9ea7f5c36569b6b28e9a1863;hb=HEAD;hpb=51d5e483a5d8b50e0c0956053e0e264c20382928

diff --git a/Makefile b/Makefile
index 308f0c95..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)
 
@@ -148,7 +135,7 @@ dist-clean:
 dist-clean-android:
 	@$(MAKE_CMD_ANDROID) dist-clean
 
-dist-build-unix:
+dist-build-linux:
 	@BUILD_DIST=TRUE $(MAKE)
 
 dist-build-win32:
@@ -157,14 +144,17 @@ dist-build-win32:
 dist-build-win64:
 	@BUILD_DIST=TRUE $(MAKE) cross-win64
 
-dist-build-macosx:
+dist-build-mac:
 	@BUILD_DIST=TRUE $(MAKE)
 
 dist-build-android:
 	@BUILD_DIST=TRUE $(MAKE) android
 
-dist-package-unix:
-	$(MAKE_DIST) package unix
+dist-build-emscripten:
+	@BUILD_DIST=TRUE $(MAKE) emscripten
+
+dist-package-linux:
+	$(MAKE_DIST) package linux
 
 dist-package-win32:
 	$(MAKE_DIST) package win32
@@ -172,14 +162,17 @@ dist-package-win32:
 dist-package-win64:
 	$(MAKE_DIST) package win64
 
-dist-package-macosx:
+dist-package-mac:
 	$(MAKE_DIST) package mac
 
 dist-package-android:
 	$(MAKE_DIST) package android
 
-dist-copy-package-unix:
-	$(MAKE_DIST) copy-package unix
+dist-package-emscripten:
+	$(MAKE_DIST) package emscripten
+
+dist-copy-package-linux:
+	$(MAKE_DIST) copy-package linux
 
 dist-copy-package-win32:
 	$(MAKE_DIST) copy-package win32
@@ -187,14 +180,17 @@ dist-copy-package-win32:
 dist-copy-package-win64:
 	$(MAKE_DIST) copy-package win64
 
-dist-copy-package-macosx:
+dist-copy-package-mac:
 	$(MAKE_DIST) copy-package mac
 
 dist-copy-package-android:
 	$(MAKE_DIST) copy-package android
 
-dist-upload-unix:
-	$(MAKE_DIST) upload unix
+dist-copy-package-emscripten:
+	$(MAKE_DIST) copy-package emscripten
+
+dist-upload-linux:
+	$(MAKE_DIST) upload linux
 
 dist-upload-win32:
 	$(MAKE_DIST) upload win32
@@ -202,34 +198,46 @@ dist-upload-win32:
 dist-upload-win64:
 	$(MAKE_DIST) upload win64
 
-dist-upload-macosx:
+dist-upload-mac:
 	$(MAKE_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-unix
+	$(MAKE) dist-package-linux
 	$(MAKE) dist-package-win32
 	$(MAKE) dist-package-win64
-	$(MAKE) dist-package-macosx
+	$(MAKE) dist-package-mac
 	$(MAKE) dist-package-android
+	$(MAKE) dist-package-emscripten
 
 dist-copy-package-all:
-	$(MAKE) dist-copy-package-unix
+	$(MAKE) dist-copy-package-linux
 	$(MAKE) dist-copy-package-win32
 	$(MAKE) dist-copy-package-win64
-	$(MAKE) dist-copy-package-macosx
+	$(MAKE) dist-copy-package-mac
 	$(MAKE) dist-copy-package-android
+	$(MAKE) dist-copy-package-emscripten
 
 dist-upload-all:
-	$(MAKE) dist-upload-unix
+	$(MAKE) dist-upload-linux
 	$(MAKE) dist-upload-win32
 	$(MAKE) dist-upload-win64
-	$(MAKE) dist-upload-macosx
+	$(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