From 599631f5bdeb193fcccde40dcd526159621bb6c9 Mon Sep 17 00:00:00 2001 From: MoNTE48 Date: Sun, 21 Feb 2021 16:53:45 +0100 Subject: [PATCH] Set `PNG_ARM_NEON_OPT=0` for Apple --- source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj | 10 ++++++++-- source/Irrlicht/libpng/pngrtran.c | 5 ++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj b/source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj index 89c46bc5..0553beda 100644 --- a/source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj +++ b/source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj @@ -3195,7 +3195,10 @@ GCC_C_LANGUAGE_STANDARD = c11; GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; - "GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = "DEBUG=1"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "PNG_ARM_NEON_OPT=0", + ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -3245,7 +3248,10 @@ GCC_C_LANGUAGE_STANDARD = c11; GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = fast; - "GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = "NDEBUG=1"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "NDEBUG=1", + "PNG_ARM_NEON_OPT=0", + ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNDECLARED_SELECTOR = YES; diff --git a/source/Irrlicht/libpng/pngrtran.c b/source/Irrlicht/libpng/pngrtran.c index 54a48646..a3cac0fc 100644 --- a/source/Irrlicht/libpng/pngrtran.c +++ b/source/Irrlicht/libpng/pngrtran.c @@ -18,8 +18,7 @@ #include "pngpriv.h" -// iOS Undefined symbols for architecture arm64 -/*#ifdef PNG_ARM_NEON_IMPLEMENTATION +#ifdef PNG_ARM_NEON_IMPLEMENTATION # if PNG_ARM_NEON_IMPLEMENTATION == 1 # define PNG_ARM_NEON_INTRINSICS_AVAILABLE # if defined(_MSC_VER) && defined(_M_ARM64) @@ -28,7 +27,7 @@ # include # endif # endif -#endif*/ +#endif #ifdef PNG_READ_SUPPORTED