aboutsummaryrefslogtreecommitdiff
path: root/build/android/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'build/android/Makefile')
-rw-r--r--build/android/Makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/build/android/Makefile b/build/android/Makefile
index ba6ab3b74..12e4872de 100644
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -125,6 +125,11 @@ FREETYPE_URL_GIT = https://github.com/cdave1/freetype2-android
-include $(PATHCFGFILE)
+#use interim target variable to switch leveldb on or off
+ifeq ($(HAVE_LEVELDB),1)
+ LEVELDB_TARGET = $(LEVELDB_LIB)
+endif
+
.PHONY : debug release reconfig delconfig \
leveldb_download clean_leveldb leveldb\
irrlicht_download clean_irrlicht irrlicht \
@@ -140,11 +145,6 @@ FREETYPE_URL_GIT = https://github.com/cdave1/freetype2-android
$(OPENSSL_TIMESTAMP) curl_binary \
$(ROOT)/jni/src/android_version.h
-#use interim target variable to switch leveldb on or off
-ifeq ($(HAVE_LEVELDB),1)
- LEVELDB_TARGET = $(LEVELDB_LIB)
-endif
-
debug : $(PATHCFGFILE)
export NDEBUG=; \
export BUILD_TYPE=debug; \
@@ -172,9 +172,9 @@ $(PATHCFGFILE) :
exit 1; \
fi; \
echo "ANDROID_NDK = $$ANDROID_NDK" > ${PATHCFGFILE}; \
- echo "NDK_MODULE_PATH = $$ANDROID_NDK/tools" >> ${PATHCFGFILE}; \
+ echo "NDK_MODULE_PATH = $$ANDROID_NDK/toolchains" >> ${PATHCFGFILE}; \
echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";\
- echo "+ Note: NDK_MODULE_PATH is set to $$ANDROID_NDK/tools"; \
+ echo "+ Note: NDK_MODULE_PATH is set to $$ANDROID_NDK/toolchains"; \
echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";\
echo "Please specify path of ANDROID SDK"; \
echo "e.g. /home/user/adt-bundle-linux-x86_64-20131030/sdk/"; \