aboutsummaryrefslogtreecommitdiff
path: root/build/android/jni/Application.mk
diff options
context:
space:
mode:
authorstujones11 <stujones111@gmail.com>2017-12-06 20:36:29 +0000
committerLoic Blot <loic.blot@unix-experience.fr>2018-03-11 16:56:27 +0100
commit22a891a925d68a096420d3383a2e31b58e3eb244 (patch)
tree21de815d25b2f9727aa019f063566426d265fa74 /build/android/jni/Application.mk
parent69247ca2233d1b2e77485b8d32aca41c7e525e74 (diff)
downloadminetest-22a891a925d68a096420d3383a2e31b58e3eb244.tar.gz
minetest-22a891a925d68a096420d3383a2e31b58e3eb244.tar.bz2
minetest-22a891a925d68a096420d3383a2e31b58e3eb244.zip
Android build fixes for c++11
Diffstat (limited to 'build/android/jni/Application.mk')
-rw-r--r--build/android/jni/Application.mk10
1 files changed, 6 insertions, 4 deletions
diff --git a/build/android/jni/Application.mk b/build/android/jni/Application.mk
index dfe7afb3d..63442dbfc 100644
--- a/build/android/jni/Application.mk
+++ b/build/android/jni/Application.mk
@@ -1,9 +1,11 @@
APP_PLATFORM := ${APP_PLATFORM}
APP_ABI := ${TARGET_ABI}
-APP_STL := gnustl_static
-NDK_TOOLCHAIN_VERSION := 4.9
+APP_STL := c++_shared
+NDK_TOOLCHAIN_VERSION := ${COMPILER_VERSION}
APP_DEPRECATED_HEADERS := true
APP_MODULES := minetest
+ifndef NDEBUG
+APP_OPTIM := debug
+endif
-APP_CPPFLAGS += -fexceptions
-APP_GNUSTL_FORCE_CPP_FEATURES := rtti
+APP_CPPFLAGS += -fexceptions -std=c++11 -frtti