Merge remote-tracking branch 'mercury/patch-irrlicht-libpng-arm' into develop

premake/irrlicht/premake5.lua

@@ -62,6 +62,8 @@ project "irrlicht"
         "NO__IRR_COMPILE_WITH_WAD_ARCHIVE_LOADER_",
         "NO_IRR_COMPILE_WITH_ZIP_ENCRYPTION_",
         "PNG_INTEL_SSE",
+        "PNG_ARM_NEON_OPT=0",
+        "PNG_ARM_NEON_IMPLEMENTATION=0",
     }
 
     files {
@@ -159,7 +161,7 @@ project "irrlicht"
 
     filter { "system:macosx" }
         cppdialect "gnu++14"
-        defines { "GL_SILENCE_DEPRECATION", "PNG_ARM_NEON_OPT=0", "PNG_ARM_NEON_IMPLEMENTATION=0" }
+        defines { "GL_SILENCE_DEPRECATION" }
         undefines { "NO_IRR_COMPILE_WITH_JOYSTICK_EVENTS_" }
         files {
             "source/Irrlicht/MacOSX/*.mm",