forked from Mirrorlandia_minetest/minetest
Fix many Android build issues
It remains one issue with MT itself and rtti
This commit is contained in:
parent
b5350e27ad
commit
0ef9c53a8c
@ -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 \
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user