Jordach
/
Minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix "Hunk #1 FAILED at 9 (different line endings)."

master
Lourens-Rich 2018-09-11 19:09:02 +03:00 committed by sfan5
parent 785f68ef33
commit 65af7d2fb6
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,13 +1,13 @@
--- irrlicht/source/Irrlicht/CEGLManager.cpp.orig 2018-06-10 16:58:11.357709173 +0200 --- irrlicht/source/Irrlicht/CEGLManager.cpp.orig 2018-09-11 18:19:51.453403631 +0300
+++ irrlicht/source/Irrlicht/CEGLManager.cpp 2018-06-10 16:58:25.100709843 +0200 +++ irrlicht/source/Irrlicht/CEGLManager.cpp 2018-09-11 18:36:24.603471869 +0300
@@ -9,6 +9,10 @@ @@ -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 namespace video