diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2018-06-10 16:59:34 +0200 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2018-06-10 17:54:44 +0200 |
| commit | 057f1574cba7ad66239fc28abb954b6b84df682f (patch) | |
| tree | 69605aeff8ec5d0ab40e6126170fcd72a55e4751 /build/android/jni | |
| parent | 90acb9b3a769fb949b7202b16e29418c945591a7 (diff) | |
| download | minetest-057f1574cba7ad66239fc28abb954b6b84df682f.tar.gz minetest-057f1574cba7ad66239fc28abb954b6b84df682f.tar.bz2 minetest-057f1574cba7ad66239fc28abb954b6b84df682f.zip | |
Fix many Android build issues
It remains one issue with MT itself and rtti
Diffstat (limited to 'build/android/jni')
| -rw-r--r-- | build/android/jni/Application.mk | 2 | ||||
| -rw-r--r-- | build/android/jni/Deps.mk | 2 | ||||
| -rw-r--r-- | build/android/jni/Irrlicht.mk | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/build/android/jni/Application.mk b/build/android/jni/Application.mk index 63442dbfc..f5eb96ed1 100644 --- a/build/android/jni/Application.mk +++ b/build/android/jni/Application.mk @@ -1,8 +1,6 @@ APP_PLATFORM := ${APP_PLATFORM} APP_ABI := ${TARGET_ABI} APP_STL := c++_shared -NDK_TOOLCHAIN_VERSION := ${COMPILER_VERSION} -APP_DEPRECATED_HEADERS := true APP_MODULES := minetest ifndef NDEBUG APP_OPTIM := debug diff --git a/build/android/jni/Deps.mk b/build/android/jni/Deps.mk index 0d007b438..ebed40adc 100644 --- a/build/android/jni/Deps.mk +++ b/build/android/jni/Deps.mk @@ -4,5 +4,5 @@ APP_STL := c++_shared NDK_TOOLCHAIN_VERSION := ${COMPILER_VERSION} APP_DEPRECATED_HEADERS := true -APP_CLAFGS += ${TARGET_CFLAGS_ADDON} +APP_CFLAGS += ${TARGET_CFLAGS_ADDON} APP_CPPFLAGS += ${TARGET_CXXFLAGS_ADDON} -fexceptions -std=c++11 diff --git a/build/android/jni/Irrlicht.mk b/build/android/jni/Irrlicht.mk index 592e1c68f..cedfe3139 100644 --- a/build/android/jni/Irrlicht.mk +++ b/build/android/jni/Irrlicht.mk @@ -1,7 +1,6 @@ APP_PLATFORM := ${APP_PLATFORM} APP_ABI := ${TARGET_ABI} APP_STL := c++_shared -NDK_TOOLCHAIN_VERSION := ${COMPILER_VERSION} APP_DEPRECATED_HEADERS := true APP_MODULES := Irrlicht |