projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed build system for Android from Ant to Gradle
[rocksndiamonds.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index cd68f28a454912e3d1998e9c8711b5e62729bc9b..308f0c9523513a0b9ea7f5c36569b6b28e9a1863 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-69,18
+69,12
@@
cross-win32:
cross-win64:
@PATH=$(CROSS_PATH_WIN64)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-win64
cross-win64:
@PATH=$(CROSS_PATH_WIN64)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-win64
-android-
compil
e:
- @$(MAKE_CMD_ANDROID)
compil
e
+android-
prepar
e:
+ @$(MAKE_CMD_ANDROID)
prepar
e
android-package:
@$(MAKE_CMD_ANDROID) package
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-clean:
@$(MAKE_CMD_ANDROID) clean
@@
-105,6
+99,9
@@
MAKE_LEVELSKETCH = ./Scripts/make_levelsketch_images.sh
auto-conf:
@$(MAKE_CMD) auto-conf
auto-conf:
@$(MAKE_CMD) auto-conf
+conf-time:
+ @$(MAKE_CMD) conf-time
+
run: all
@$(MAKE_CMD) run
run: all
@$(MAKE_CMD) run