X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=Makefile;h=9dbdfe2bb4c92df5776b0b0161e96f38aac8f894;hb=38c98f98f536b80d9f8f2af263e2f22825ab5b2b;hp=2985f1a6cb9361eeccf1d64ff1316109aa1854a2;hpb=9abcf55b37b16240d95e43b469008833171b4e41;p=rocksndiamonds.git diff --git a/Makefile b/Makefile index 2985f1a6..9dbdfe2b 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ CROSS_PATH_WIN32 = /usr/local/cross-tools/i386-mingw32msvc .EXPORT_ALL_VARIABLES: SRC_DIR = src -ANDROID_DIR = android +ANDROID_DIR ?= build-projects/android MAKE_CMD = $(MAKE) -C $(SRC_DIR) MAKE_CMD_ANDROID = $(MAKE) -C $(ANDROID_DIR) @@ -83,6 +83,9 @@ android-package: android-install: @$(MAKE_CMD_ANDROID) install +android-assets-toc: + @$(MAKE_CMD_ANDROID) assets-toc + android-clean: @$(MAKE_CMD_ANDROID) clean @@ -223,7 +226,7 @@ dist-release-all: dist-package-all dist-copy-package-all dist-upload-all package-all: dist-package-all -copy-package-all: dist-copy-package_all +copy-package-all: dist-copy-package-all upload-all: dist-upload-all