diff options
| author | stujones11 <stujones111@gmail.com> | 2017-11-15 19:52:19 +0000 |
|---|---|---|
| committer | paramat <mat.gregory@virginmedia.com> | 2017-12-04 02:20:32 +0000 |
| commit | 2507d32afe05c73bb27ed221c2a592b0894fdc68 (patch) | |
| tree | 2b5930ce0a241c3abd06a389b5f9e0173cd325c7 /build/android/jni | |
| parent | 2174298ffab0b6224cda35a47f326c7c4e53bf11 (diff) | |
| download | minetest-2507d32afe05c73bb27ed221c2a592b0894fdc68.tar.gz minetest-2507d32afe05c73bb27ed221c2a592b0894fdc68.tar.bz2 minetest-2507d32afe05c73bb27ed221c2a592b0894fdc68.zip | |
Android: Update build system for ndk-r15x
Add workarounds for ndk-r16.
Diffstat (limited to 'build/android/jni')
| -rw-r--r-- | build/android/jni/Application.mk | 10 | ||||
| -rw-r--r-- | build/android/jni/Deps.mk | 8 | ||||
| -rw-r--r-- | build/android/jni/Irrlicht.mk | 9 |
3 files changed, 22 insertions, 5 deletions
diff --git a/build/android/jni/Application.mk b/build/android/jni/Application.mk index 53467059a..dfe7afb3d 100644 --- a/build/android/jni/Application.mk +++ b/build/android/jni/Application.mk @@ -1,9 +1,9 @@ -# NDK_TOOLCHAIN_VERSION := clang3.8 - -APP_PLATFORM := android-9 -APP_MODULES := minetest +APP_PLATFORM := ${APP_PLATFORM} +APP_ABI := ${TARGET_ABI} APP_STL := gnustl_static +NDK_TOOLCHAIN_VERSION := 4.9 +APP_DEPRECATED_HEADERS := true +APP_MODULES := minetest APP_CPPFLAGS += -fexceptions APP_GNUSTL_FORCE_CPP_FEATURES := rtti - diff --git a/build/android/jni/Deps.mk b/build/android/jni/Deps.mk new file mode 100644 index 000000000..36af338b2 --- /dev/null +++ b/build/android/jni/Deps.mk @@ -0,0 +1,8 @@ +APP_PLATFORM := ${APP_PLATFORM} +APP_ABI := ${TARGET_ABI} +APP_STL := gnustl_static +NDK_TOOLCHAIN_VERSION := 4.9 +APP_DEPRECATED_HEADERS := true + +APP_CLAFGS += -mfloat-abi=softfp -mfpu=vfpv3 -O3 +APP_CPPFLAGS += -fexceptions diff --git a/build/android/jni/Irrlicht.mk b/build/android/jni/Irrlicht.mk new file mode 100644 index 000000000..a48c2902b --- /dev/null +++ b/build/android/jni/Irrlicht.mk @@ -0,0 +1,9 @@ +APP_PLATFORM := ${APP_PLATFORM} +APP_ABI := ${TARGET_ABI} +APP_STL := gnustl_static +NDK_TOOLCHAIN_VERSION := 4.9 +APP_DEPRECATED_HEADERS := true +APP_MODULES := Irrlicht + +APP_CLAFGS += -mfloat-abi=softfp -mfpu=vfpv3 -O3 +APP_CPPFLAGS += -fexceptions |