aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build/android/Makefile11
-rw-r--r--build/android/jni/Application.mk2
-rw-r--r--build/android/jni/Deps.mk2
-rw-r--r--build/android/jni/Irrlicht.mk1
-rw-r--r--build/android/patches/irrlicht-native_activity.patch11
5 files changed, 12 insertions, 15 deletions
diff --git a/build/android/Makefile b/build/android/Makefile
index f32dbdc11..1d6df6e7d 100644
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -86,7 +86,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/
@@ -268,11 +268,10 @@ $(OGG_LIB): $(OGG_TIMESTAMP)
cd ${OGG_DIR}; \
export APP_PLATFORM=${APP_PLATFORM}; \
export TARGET_ABI=${TARGET_ABI}; \
- export TARGET_CFLAGS_ADDON="${TARGET_CFLAGS_ADDON}"; \
- export TARGET_CXXFLAGS_ADDON="${TARGET_CXXFLAGS_ADDON}"; \
- export COMPILER_VERSION=${COMPILER_VERSION}; \
- ${ANDROID_NDK}/ndk-build \
- 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 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
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