From 65af7d2fb6a7e9537dedfb9d11e93c929030d71b Mon Sep 17 00:00:00 2001 From: Lourens-Rich Date: Tue, 11 Sep 2018 19:09:02 +0300 Subject: [PATCH] Fix "Hunk #1 FAILED at 9 (different line endings)." --- .../patches/irrlicht-native_activity.patch | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/build/android/patches/irrlicht-native_activity.patch b/build/android/patches/irrlicht-native_activity.patch index 83c83788..a9d2610c 100644 --- a/build/android/patches/irrlicht-native_activity.patch +++ b/build/android/patches/irrlicht-native_activity.patch @@ -1,13 +1,13 @@ ---- 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 +--- irrlicht/source/Irrlicht/CEGLManager.cpp.orig 2018-09-11 18:19:51.453403631 +0300 ++++ irrlicht/source/Irrlicht/CEGLManager.cpp 2018-09-11 18:36:24.603471869 +0300 @@ -9,6 +9,10 @@ - #include "irrString.h" - #include "os.h" - -+#if defined(_IRR_COMPILE_WITH_ANDROID_DEVICE_) -+#include -+#endif -+ - namespace irr - { - namespace video + #include "irrString.h" + #include "os.h" + ++#if defined(_IRR_COMPILE_WITH_ANDROID_DEVICE_) ++#include ++#endif ++ + namespace irr + { + namespace video