Fix "Hunk #1 FAILED at 9 (different line endings)."
authorLourens-Rich <lourens@openmailbox.org>
Tue, 11 Sep 2018 16:09:02 +0000 (19:09 +0300)
committersfan5 <sfan5@live.de>
Sun, 23 Sep 2018 12:03:05 +0000 (14:03 +0200)
build/android/patches/irrlicht-native_activity.patch

index 83c837886fbb357e0d7bd9e2c4685960cf0ddf49..a9d2610c36684b173b339a25e349d5746a56ba38 100644 (file)
@@ -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"\r
+ #include "os.h"\r
\r
++#if defined(_IRR_COMPILE_WITH_ANDROID_DEVICE_)\r
++#include <android/native_activity.h>\r
++#endif\r
++\r
+ namespace irr\r
+ {\r
+ namespace video\r