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:01:47 +0200 |
| commit | 0ef9c53a8c20872ce69f1c539167497a04efe529 (patch) | |
| tree | cf3c784bdfd0b0bc95e5c8f780305057fd5741c2 /build | |
| parent | b5350e27ad7bc54a3a97db988119db83c67f96b3 (diff) | |
| download | minetest-0ef9c53a8c20872ce69f1c539167497a04efe529.tar.gz minetest-0ef9c53a8c20872ce69f1c539167497a04efe529.tar.bz2 minetest-0ef9c53a8c20872ce69f1c539167497a04efe529.zip | |
Fix many Android build issues
It remains one issue with MT itself and rtti
Diffstat (limited to 'build')
| -rw-r--r-- | build/android/Makefile | 8 | ||||
| -rw-r--r-- | build/android/jni/Application.mk | 5 | ||||
| -rw-r--r-- | build/android/jni/Deps.mk | 5 | ||||
| -rw-r--r-- | build/android/jni/Irrlicht.mk | 3 | ||||
| -rw-r--r-- | build/android/patches/irrlicht-native_activity.patch | 11 |
5 files changed, 15 insertions, 17 deletions
diff --git a/build/android/Makefile b/build/android/Makefile index df1b01ae9..5fe0321b7 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -83,7 +83,7 @@ OGG_LIB = $(OGG_DIR)libs/$(TARGET_ABI)/libogg.so VORBIS_LIB = $(OGG_DIR)libs/$(TARGET_ABI)/libogg.so OGG_TIMESTAMP = $(OGG_DIR)timestamp OGG_TIMESTAMP_INT = $(ANDR_ROOT)/deps/ogg_timestamp -OGG_URL_GIT = https://github.com/vincentjames501/libvorbis-libogg-android +OGG_URL_GIT = https://gitlab.com/minetest/libvorbis-libogg-android IRRLICHT_REVISION = 5145 IRRLICHT_DIR = $(ANDR_ROOT)/deps/irrlicht/ @@ -262,8 +262,10 @@ $(OGG_LIB): $(OGG_TIMESTAMP) cd ${OGG_DIR}; \ export APP_PLATFORM=${APP_PLATFORM}; \ export TARGET_ABI=${TARGET_ABI}; \ - ${ANDROID_NDK}/ndk-build NDEBUG=${NDEBUG} \ - NDK_APPLICATION_MK=${ANDR_ROOT}/jni/Deps.mk || exit 1; \ + ${ANDROID_NDK}/build/tools/make-standalone-toolchain.sh \ + --toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \ + --platform=${APP_PLATFORM} \ + --install-dir=$${TOOLCHAIN}; \ touch ${OGG_TIMESTAMP}; \ touch ${OGG_TIMESTAMP_INT}; \ else \ diff --git a/build/android/jni/Application.mk b/build/android/jni/Application.mk index dfe7afb3d..0d5e5100e 100644 --- a/build/android/jni/Application.mk +++ b/build/android/jni/Application.mk @@ -1,9 +1,6 @@ APP_PLATFORM := ${APP_PLATFORM} APP_ABI := ${TARGET_ABI} -APP_STL := gnustl_static -NDK_TOOLCHAIN_VERSION := 4.9 -APP_DEPRECATED_HEADERS := true +APP_STL := c++_static 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 index 36af338b2..6a58c5428 100644 --- a/build/android/jni/Deps.mk +++ b/build/android/jni/Deps.mk @@ -1,8 +1,7 @@ APP_PLATFORM := ${APP_PLATFORM} APP_ABI := ${TARGET_ABI} -APP_STL := gnustl_static -NDK_TOOLCHAIN_VERSION := 4.9 +APP_STL := c++_static APP_DEPRECATED_HEADERS := true -APP_CLAFGS += -mfloat-abi=softfp -mfpu=vfpv3 -O3 +APP_CFLAGS += -mfloat-abi=softfp -mfpu=vfpv3 -O3 APP_CPPFLAGS += -fexceptions diff --git a/build/android/jni/Irrlicht.mk b/build/android/jni/Irrlicht.mk index a48c2902b..0bc56a2ab 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 := gnustl_static -NDK_TOOLCHAIN_VERSION := 4.9 +APP_STL := c++_static APP_DEPRECATED_HEADERS := true APP_MODULES := Irrlicht diff --git a/build/android/patches/irrlicht-native_activity.patch b/build/android/patches/irrlicht-native_activity.patch index 5e9699e4f..83c837886 100644 --- a/build/android/patches/irrlicht-native_activity.patch +++ b/build/android/patches/irrlicht-native_activity.patch @@ -1,12 +1,13 @@ ---- irrlicht/source/Irrlicht/CEGLManager.cpp.orig 2017-11-15 18:19:58.467279274 +0000 -+++ irrlicht/source/Irrlicht/CEGLManager.cpp 2017-11-15 18:19:54.175279087 +0000 -@@ -8,6 +8,9 @@ - +--- irrlicht/source/Irrlicht/CEGLManager.cpp.orig 2018-06-10 16:58:11.357709173 +0200 ++++ irrlicht/source/Irrlicht/CEGLManager.cpp 2018-06-10 16:58:25.100709843 +0200 +@@ -9,6 +9,10 @@ #include "irrString.h" #include "os.h" + +#if defined(_IRR_COMPILE_WITH_ANDROID_DEVICE_) +#include <android/native_activity.h> +#endif - ++ namespace irr { + namespace video |