aboutsummaryrefslogtreecommitdiff
path: root/build/android/patches
diff options
context:
space:
mode:
authorLoic Blot <loic.blot@unix-experience.fr>2018-06-10 16:59:34 +0200
committerLoic Blot <loic.blot@unix-experience.fr>2018-06-10 17:54:44 +0200
commit057f1574cba7ad66239fc28abb954b6b84df682f (patch)
tree69605aeff8ec5d0ab40e6126170fcd72a55e4751 /build/android/patches
parent90acb9b3a769fb949b7202b16e29418c945591a7 (diff)
downloadminetest-057f1574cba7ad66239fc28abb954b6b84df682f.tar.gz
minetest-057f1574cba7ad66239fc28abb954b6b84df682f.tar.bz2
minetest-057f1574cba7ad66239fc28abb954b6b84df682f.zip
Fix many Android build issues
It remains one issue with MT itself and rtti
Diffstat (limited to 'build/android/patches')
-rw-r--r--build/android/patches/irrlicht-native_activity.patch11
1 files changed, 6 insertions, 5 deletions
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