projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improved loading menu graphics config settings (more generic solution)
[rocksndiamonds.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 2985f1a6cb9361eeccf1d64ff1316109aa1854a2..68745a5d615e1e4bdab3a2ddabb27d43e3ffdcbc 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-49,7
+49,7
@@
CROSS_PATH_WIN32 = /usr/local/cross-tools/i386-mingw32msvc
.EXPORT_ALL_VARIABLES:
SRC_DIR = src
.EXPORT_ALL_VARIABLES:
SRC_DIR = src
-ANDROID_DIR = android
+ANDROID_DIR
?
= android
MAKE_CMD = $(MAKE) -C $(SRC_DIR)
MAKE_CMD_ANDROID = $(MAKE) -C $(ANDROID_DIR)
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-install:
@$(MAKE_CMD_ANDROID) install
+android-assets-toc:
+ @$(MAKE_CMD_ANDROID) assets-toc
+
android-clean:
@$(MAKE_CMD_ANDROID) clean
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
package-all: dist-package-all
-copy-package-all: dist-copy-package
_
all
+copy-package-all: dist-copy-package
-
all
upload-all: dist-upload-all
upload-all: dist-upload-all