X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=Makefile;h=68745a5d615e1e4bdab3a2ddabb27d43e3ffdcbc;hp=41840b0cb6e2734dd816b2dd57051631069f5bfa;hb=facc7fc609a80b0925a0699b39d5e4a048e052d7;hpb=eb72f4adc74084da40e39484b2545e3d49d39eaa

diff --git a/Makefile b/Makefile
index 41840b0c..68745a5d 100644
--- a/Makefile
+++ b/Makefile
@@ -22,27 +22,22 @@ CC = gcc
 MAKE = make
 
 # 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 = /usr/games
+# RO_GAME_DIR = .
 # 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 = /var/games
+# RW_GAME_DIR = .
 # use the following setting for Debian / Ubuntu installations:
 # RW_GAME_DIR = /var/games/rocksndiamonds
 
 # uncomment if system has no joystick include file
 # JOYSTICK = -DNO_JOYSTICK
 
-# choose if more than one global score file entry for one player is allowed
-# (default: MANY_PER_NAME)
-# uncomment to install game in multi-user environment
-# SCORE_ENTRIES = ONE_PER_NAME
-# uncomment to install game in single-user environment (default)
-# SCORE_ENTRIES = MANY_PER_NAME
-
 # path for cross-compiling (only needed for non-native Windows build)
 CROSS_PATH_WIN32 = /usr/local/cross-tools/i386-mingw32msvc
 
@@ -54,7 +49,10 @@ CROSS_PATH_WIN32 = /usr/local/cross-tools/i386-mingw32msvc
 .EXPORT_ALL_VARIABLES:
 
 SRC_DIR = src
+ANDROID_DIR ?= android
+
 MAKE_CMD = $(MAKE) -C $(SRC_DIR)
+MAKE_CMD_ANDROID = $(MAKE) -C $(ANDROID_DIR)
 
 
 # -----------------------------------------------------------------------------
@@ -76,17 +74,39 @@ mac:
 cross-win32:
 	@PATH=$(CROSS_PATH_WIN32)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-win32
 
+android-compile:
+	@$(MAKE_CMD_ANDROID) compile
+
+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
+
+android: android-package
+
 clean:
 	@$(MAKE_CMD) clean
 
 clean-git:
 	@$(MAKE_CMD) clean-git
 
+clean-android: android-clean
+
 
 # -----------------------------------------------------------------------------
-# development, test, distribution build and packaging targets
+# development targets
 # -----------------------------------------------------------------------------
 
+MAKE_ENGINETEST = ./Scripts/make_enginetest.sh
+MAKE_LEVELSKETCH = ./Scripts/make_levelsketch_images.sh
+
 auto-conf:
 	@$(MAKE_CMD) auto-conf
 
@@ -99,27 +119,43 @@ gdb: all
 valgrind: all
 	@$(MAKE_CMD) valgrind
 
+tags:
+	$(MAKE_CMD) tags
+
+depend dep:
+	$(MAKE_CMD) depend
+
 enginetest: all
-	./Scripts/make_enginetest.sh
+	$(MAKE_ENGINETEST)
 
 enginetestcustom: all
-	./Scripts/make_enginetest.sh custom
+	$(MAKE_ENGINETEST) custom
 
 enginetestfast: all
-	./Scripts/make_enginetest.sh fast
+	$(MAKE_ENGINETEST) fast
 
 enginetestnew: all
-	./Scripts/make_enginetest.sh new
+	$(MAKE_ENGINETEST) new
 
 leveltest: all
-	./Scripts/make_enginetest.sh leveltest
+	$(MAKE_ENGINETEST) leveltest
 
 levelsketch_images: all
-	./Scripts/make_levelsketch_images.sh
+	$(MAKE_LEVELSKETCH)
+
+
+# -----------------------------------------------------------------------------
+# distribution targets
+# -----------------------------------------------------------------------------
+
+MAKE_DIST = ./Scripts/make_dist.sh
 
 dist-clean:
 	@$(MAKE_CMD) dist-clean
 
+dist-clean-android:
+	@$(MAKE_CMD_ANDROID) dist-clean
+
 dist-build-unix:
 	@BUILD_DIST=TRUE $(MAKE)
 
@@ -129,40 +165,69 @@ dist-build-win32:
 dist-build-macosx:
 	@BUILD_DIST=TRUE $(MAKE)
 
+dist-build-android:
+	@BUILD_DIST=TRUE $(MAKE) android
+
 dist-package-unix:
-	./Scripts/make_dist.sh package unix
+	$(MAKE_DIST) package unix
 
 dist-package-win32:
-	./Scripts/make_dist.sh package win
+	$(MAKE_DIST) package win
 
 dist-package-macosx:
-	./Scripts/make_dist.sh 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-win32:
+	$(MAKE_DIST) copy-package win
+
+dist-copy-package-macosx:
+	$(MAKE_DIST) copy-package mac
+
+dist-copy-package-android:
+	$(MAKE_DIST) copy-package android
 
 dist-upload-unix:
-	./Scripts/make_dist.sh upload unix
+	$(MAKE_DIST) upload unix
 
 dist-upload-win32:
-	./Scripts/make_dist.sh upload win
+	$(MAKE_DIST) upload win
 
 dist-upload-macosx:
-	./Scripts/make_dist.sh upload mac
+	$(MAKE_DIST) upload mac
+
+dist-upload-android:
+	$(MAKE_DIST) upload android
 
 dist-package-all:
 	$(MAKE) dist-package-unix
 	$(MAKE) dist-package-win32
 	$(MAKE) dist-package-macosx
+	$(MAKE) dist-package-android
+
+dist-copy-package-all:
+	$(MAKE) dist-copy-package-unix
+	$(MAKE) dist-copy-package-win32
+	$(MAKE) dist-copy-package-macosx
+	$(MAKE) dist-copy-package-android
 
 dist-upload-all:
 	$(MAKE) dist-upload-unix
 	$(MAKE) dist-upload-win32
 	$(MAKE) dist-upload-macosx
+	$(MAKE) dist-upload-android
+
+dist-release-all: dist-package-all dist-copy-package-all dist-upload-all
 
 package-all: dist-package-all
 
-upload-all: dist-upload-all
+copy-package-all: dist-copy-package-all
 
-tags:
-	$(MAKE_CMD) tags
+upload-all: dist-upload-all
 
-depend dep:
-	$(MAKE_CMD) depend
+release-all: dist-release-all