X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=Makefile;h=3e5877f063d467b511c5bcff015b9361542789a4;hp=8921819891e9c82403ee3783ffa9532df6ca810b;hb=67f3bfab902e53e0dc24a01eb6c0e4d274030a47;hpb=79d9ea719f6a44c452f394600c6076063d4c73de

diff --git a/Makefile b/Makefile
index 89218198..3e5877f0 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
 # =============================================================================
@@ -63,33 +63,18 @@ MAKE_CMD_ANDROID = $(MAKE) -C $(ANDROID_DIR)
 all:
 	@$(MAKE_CMD)
 
-sdl:
-	@$(MAKE_CMD) TARGET=sdl
-
-sdl2:
-	@$(MAKE_CMD) TARGET=sdl2
-
-mac:
-	@$(MAKE_CMD) PLATFORM=macosx
-
 cross-win32:
 	@PATH=$(CROSS_PATH_WIN32)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-win32
 
 cross-win64:
 	@PATH=$(CROSS_PATH_WIN64)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-win64
 
-android-compile:
-	@$(MAKE_CMD_ANDROID) compile
+android-prepare:
+	@$(MAKE_CMD_ANDROID) prepare
 
 android-package:
 	@$(MAKE_CMD_ANDROID) package
 
-android-install:
-	@$(MAKE_CMD_ANDROID) install
-
-android-assets-toc:
-	@$(MAKE_CMD_ANDROID) assets-toc
-
 android-clean:
 	@$(MAKE_CMD_ANDROID) clean
 
@@ -114,6 +99,12 @@ MAKE_LEVELSKETCH = ./Scripts/make_levelsketch_images.sh
 auto-conf:
 	@$(MAKE_CMD) auto-conf
 
+conf-time:
+	@$(MAKE_CMD) conf-time
+
+conf-hash:
+	@$(MAKE_CMD) conf-hash
+
 run: all
 	@$(MAKE_CMD) run
 
@@ -160,7 +151,7 @@ dist-clean:
 dist-clean-android:
 	@$(MAKE_CMD_ANDROID) dist-clean
 
-dist-build-unix:
+dist-build-linux:
 	@BUILD_DIST=TRUE $(MAKE)
 
 dist-build-win32:
@@ -169,14 +160,14 @@ 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-package-linux:
+	$(MAKE_DIST) package linux
 
 dist-package-win32:
 	$(MAKE_DIST) package win32
@@ -184,14 +175,14 @@ 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-copy-package-linux:
+	$(MAKE_DIST) copy-package linux
 
 dist-copy-package-win32:
 	$(MAKE_DIST) copy-package win32
@@ -199,14 +190,14 @@ 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-upload-linux:
+	$(MAKE_DIST) upload linux
 
 dist-upload-win32:
 	$(MAKE_DIST) upload win32
@@ -214,31 +205,31 @@ 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-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
 
 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
 
 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
 
 dist-release-all: dist-package-all dist-copy-package-all dist-upload-all