From c1b347d39b6c069c73818bcd7fedd0da2be08342 Mon Sep 17 00:00:00 2001 From: Daggolin Date: Sat, 16 Sep 2023 14:35:29 +0200 Subject: [PATCH] [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). --- CMakeLists.txt | 1 + lib/zlib/gzguts.h | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 76b334c70a..10092066ba 100644 --- 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 index d87659d031..0f340e9156 100644 --- 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 +#endif + #ifdef _LARGEFILE64_SOURCE # ifndef _LARGEFILE_SOURCE # define _LARGEFILE_SOURCE 1