Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 10:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix many Android build issues

Browse Source 
It remains one issue with MT itself and rtti
This commit is contained in:
Loic Blot 2018-06-10 16:59:34 +02:00
parent 90acb9b3a7
commit 057f1574cb
No known key found for this signature in database
GPG Key ID: EFAA458E8C153987
5 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build/android/Makefile
View File

@ -86,7 +86,7 @@ OGG_LIB = $(OGG_DIR)libs/$(TARGET_ABI)/libogg.so
VORBIS_LIB = $(OGG_DIR)libs/$(TARGET_ABI)/libogg.so VORBIS_LIB = $(OGG_DIR)libs/$(TARGET_ABI)/libogg.so
OGG_TIMESTAMP = $(OGG_DIR)timestamp OGG_TIMESTAMP = $(OGG_DIR)timestamp
OGG_TIMESTAMP_INT = $(ANDR_ROOT)/deps/ogg_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_REVISION = 5145
IRRLICHT_DIR = $(ANDR_ROOT)/deps/irrlicht/ IRRLICHT_DIR = $(ANDR_ROOT)/deps/irrlicht/
@ -268,11 +268,10 @@ $(OGG_LIB): $(OGG_TIMESTAMP)
cd ${OGG_DIR}; \ cd ${OGG_DIR}; \
export APP_PLATFORM=${APP_PLATFORM}; \ export APP_PLATFORM=${APP_PLATFORM}; \
export TARGET_ABI=${TARGET_ABI}; \ export TARGET_ABI=${TARGET_ABI}; \
export TARGET_CFLAGS_ADDON="${TARGET_CFLAGS_ADDON}"; \ ${ANDROID_NDK}/build/tools/make-standalone-toolchain.sh \
export TARGET_CXXFLAGS_ADDON="${TARGET_CXXFLAGS_ADDON}"; \ --toolchain=${TARGET_TOOLCHAIN}${COMPILER_VERSION} \
export COMPILER_VERSION=${COMPILER_VERSION}; \ --platform=${APP_PLATFORM} \
${ANDROID_NDK}/ndk-build \ --install-dir=$${TOOLCHAIN}; \
NDK_APPLICATION_MK=${ANDR_ROOT}/jni/Deps.mk || exit 1; \
touch ${OGG_TIMESTAMP}; \ touch ${OGG_TIMESTAMP}; \
touch ${OGG_TIMESTAMP_INT}; \ touch ${OGG_TIMESTAMP_INT}; \
else \ else \

2
build/android/jni/Application.mk
View File

@ -1,8 +1,6 @@
APP_PLATFORM := ${APP_PLATFORM} APP_PLATFORM := ${APP_PLATFORM}
APP_ABI := ${TARGET_ABI} APP_ABI := ${TARGET_ABI}
APP_STL := c++_shared APP_STL := c++_shared
NDK_TOOLCHAIN_VERSION := ${COMPILER_VERSION}
APP_DEPRECATED_HEADERS := true
APP_MODULES := minetest APP_MODULES := minetest
ifndef NDEBUG ifndef NDEBUG
APP_OPTIM := debug APP_OPTIM := debug

2
build/android/jni/Deps.mk
View File

@ -4,5 +4,5 @@ APP_STL := c++_shared
NDK_TOOLCHAIN_VERSION := ${COMPILER_VERSION} NDK_TOOLCHAIN_VERSION := ${COMPILER_VERSION}
APP_DEPRECATED_HEADERS := true APP_DEPRECATED_HEADERS := true
APP_CLAFGS += ${TARGET_CFLAGS_ADDON} APP_CFLAGS += ${TARGET_CFLAGS_ADDON}
APP_CPPFLAGS += ${TARGET_CXXFLAGS_ADDON} -fexceptions -std=c++11 APP_CPPFLAGS += ${TARGET_CXXFLAGS_ADDON} -fexceptions -std=c++11

1
build/android/jni/Irrlicht.mk
View File

@ -1,7 +1,6 @@
APP_PLATFORM := ${APP_PLATFORM} APP_PLATFORM := ${APP_PLATFORM}
APP_ABI := ${TARGET_ABI} APP_ABI := ${TARGET_ABI}
APP_STL := c++_shared APP_STL := c++_shared
NDK_TOOLCHAIN_VERSION := ${COMPILER_VERSION}
APP_DEPRECATED_HEADERS := true APP_DEPRECATED_HEADERS := true
APP_MODULES := Irrlicht APP_MODULES := Irrlicht

11
build/android/patches/irrlicht-native_activity.patch
View File

@ -1,12 +1,13 @@
--- irrlicht/source/Irrlicht/CEGLManager.cpp.orig 2017-11-15 18:19:58.467279274 +0000 --- irrlicht/source/Irrlicht/CEGLManager.cpp.orig 2018-06-10 16:58:11.357709173 +0200
+++ irrlicht/source/Irrlicht/CEGLManager.cpp 2017-11-15 18:19:54.175279087 +0000 +++ irrlicht/source/Irrlicht/CEGLManager.cpp 2018-06-10 16:58:25.100709843 +0200
@@ -8,6 +8,9 @@ @@ -9,6 +9,10 @@
#include "irrString.h" #include "irrString.h"
#include "os.h" #include "os.h"
+#if defined(_IRR_COMPILE_WITH_ANDROID_DEVICE_) +#if defined(_IRR_COMPILE_WITH_ANDROID_DEVICE_)
+#include <android/native_activity.h> +#include <android/native_activity.h>
+#endif +#endif
+
namespace irr namespace irr
{ {
namespace video