Skip to content

Commit

Permalink
Fix "Hunk #1 FAILED at 9 (different line endings)."
Browse files Browse the repository at this point in the history
  • Loading branch information
Lourens-Rich authored and sfan5 committed Sep 23, 2018
1 parent 785f68e commit 65af7d2
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions build/android/patches/irrlicht-native_activity.patch
Original file line number Diff line number Diff line change
@@ -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 <android/native_activity.h>
+#endif
+
namespace irr
{
namespace video
#include "irrString.h"
#include "os.h"

+#if defined(_IRR_COMPILE_WITH_ANDROID_DEVICE_)
+#include <android/native_activity.h>
+#endif
+
namespace irr
{
namespace video

0 comments on commit 65af7d2

Please sign in to comment.