[Shared] Workarounds for zlib and libpng to compile on macOS 13.5.2 (…

…Apple M1) using Xcode 14.3.1 (14E300c). The same workarounds were also used to compile on macOS 11.4 (Apple M1) using Xcode 12.5.1 (12E507).
JACoders · Sep 17, 2023 · c1b347d · c1b347d
1 parent 41ff78f
commit c1b347d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -114,6 +114,7 @@ else()
 	set(X86 OFF)
 	if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64|aarch64)$")
 		set(Architecture "arm64")
+		add_definitions(-DPNG_ARM_NEON_OPT=0)
 	elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
 		set(Architecture "arm")
 	elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$")

diff --git a/lib/zlib/gzguts.h b/lib/zlib/gzguts.h
@@ -3,6 +3,10 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
+#if defined(__APPLE__)
+#  include <unistd.h>
+#endif
+
 #ifdef _LARGEFILE64_SOURCE
 #  ifndef _LARGEFILE_SOURCE
 #    define _LARGEFILE_SOURCE 1