From 057f1574cba7ad66239fc28abb954b6b84df682f Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Sun, 10 Jun 2018 16:59:34 +0200 Subject: Fix many Android build issues It remains one issue with MT itself and rtti --- build/android/jni/Application.mk | 2 -- build/android/jni/Deps.mk | 2 +- build/android/jni/Irrlicht.mk | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) (limited to 'build/android/jni') 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 -- cgit v1.2.3