diff --git a/build/iOS/deps/irrlicht.sh b/build/iOS/deps/irrlicht.sh index bcbdaf33..5b384c98 100755 --- a/build/iOS/deps/irrlicht.sh +++ b/build/iOS/deps/irrlicht.sh @@ -3,12 +3,12 @@ . sdk.sh [ ! -d irrlicht-src ] && \ - svn co -r 5415 svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es irrlicht-src + svn co -r 5573 svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es irrlicht-src cd irrlicht-src/ if [ ! -f .patched ]; then - for p in touchcount unscaled dblfreefix viewcontroller; do + for p in touchcount unscaled dblfreefix viewcontroller headerpath roundingerror; do patch -p0 <../../patches/irrlicht-$p.patch done touch .patched diff --git a/build/iOS/patches/irrlicht-headerpath.patch b/build/iOS/patches/irrlicht-headerpath.patch new file mode 100755 index 00000000..ea41e0df --- /dev/null +++ b/build/iOS/patches/irrlicht-headerpath.patch @@ -0,0 +1,18 @@ +--- source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj.orig 2018-04-17 12:20:00.000000000 +0200 ++++ source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj 2018-04-17 12:36:00.000000000 +0200 +@@ -3311,6 +3319,7 @@ + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; ++ HEADER_SEARCH_PATHS = "${SRCROOT}/../../include"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; +@@ -3345,6 +3354,7 @@ + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; ++ HEADER_SEARCH_PATHS = "${SRCROOT}/../../include"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_MODULE_NAME = Irrlicht; diff --git a/build/iOS/patches/irrlicht-roundingerror.patch b/build/iOS/patches/irrlicht-roundingerror.patch new file mode 100644 index 00000000..d9e991fd --- /dev/null +++ b/build/iOS/patches/irrlicht-roundingerror.patch @@ -0,0 +1,15 @@ +--- include/irrMath.h.orig 2018-04-17 13:15:07.000000000 +0200 ++++ include/irrMath.h 2018-04-17 13:15:50.000000000 +0200 +@@ -196,6 +196,12 @@ + { + return ROUNDING_ERROR_f64; + } ++ ++ template <> ++ inline s16 roundingError() ++ { ++ return 0; ++ } + + template <> + inline s32 roundingError()