From: Holger Schemel Date: Sun, 4 Mar 2018 19:46:31 +0000 (+0100) Subject: improved Makefile for packaging and added targets for Android package X-Git-Tag: 4.0.1.4~4 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=9abcf55b37b16240d95e43b469008833171b4e41;p=rocksndiamonds.git improved Makefile for packaging and added targets for Android package --- diff --git a/Makefile b/Makefile index 5d94cb1a..2985f1a6 100644 --- a/Makefile +++ b/Makefile @@ -49,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) # ----------------------------------------------------------------------------- @@ -71,17 +74,36 @@ 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-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 @@ -94,27 +116,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) @@ -124,40 +162,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