From 075bccb9b4e7684cccf3058720f38c68125b0d38 Mon Sep 17 00:00:00 2001 From: laggykiller Date: Thu, 29 Feb 2024 01:17:42 +0800 Subject: [PATCH] Build with macos deployment target 10.9 --- .github/workflows/build.yml | 15 +++------------ CMakeLists.txt | 3 ++- apngasm | 2 +- scripts/get_deps.py | 2 +- 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d93a74a..807ba5d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,24 +56,15 @@ jobs: - os: macos-12 cibw_archs: x86_64 cibw_build: "*" - cibw_environment: > - APNGASM_COMPILE_TARGET=x86_64 - _PYTHON_HOST_PLATFORM=macosx-10.15-x86_64 - MACOSX_DEPLOYMENT_TARGET=10.15 + cibw_environment: APNGASM_COMPILE_TARGET=x86_64 - os: macos-14 cibw_archs: arm64 cibw_build: "*" - cibw_environment: > - APNGASM_COMPILE_TARGET=armv8 - _PYTHON_HOST_PLATFORM=macosx-11.0-arm64 - MACOSX_DEPLOYMENT_TARGET=11.0 + cibw_environment: APNGASM_COMPILE_TARGET=armv8 - os: macos-14 cibw_archs: universal2 cibw_build: "*" - cibw_environment: > - APNGASM_COMPILE_TARGET=universal2 - _PYTHON_HOST_PLATFORM=macosx-10.15-universal2 - MACOSX_DEPLOYMENT_TARGET=10.15 + cibw_environment: APNGASM_COMPILE_TARGET=universal2 - os: ubuntu-20.04 cibw_archs: x86_64 cibw_build: "*" diff --git a/CMakeLists.txt b/CMakeLists.txt index f56eb85..8e10094 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,8 @@ elseif (APPLE) if(${APNGASM_COMPILE_TARGET} STREQUAL "armv8") set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0") else() - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15") + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -stdlib=libc++") endif() endif() diff --git a/apngasm b/apngasm index c983a42..19d4ee1 160000 --- a/apngasm +++ b/apngasm @@ -1 +1 @@ -Subproject commit c983a42c17b1625b6c6d7fb6e36c756757e499a8 +Subproject commit 19d4ee1366bf94fe41856d7204deff4f6db401aa diff --git a/scripts/get_deps.py b/scripts/get_deps.py index 06c1cf2..823586f 100755 --- a/scripts/get_deps.py +++ b/scripts/get_deps.py @@ -21,7 +21,7 @@ def install_deps(arch: str): if arch == "armv8": settings.append("os.version=11.0") else: - settings.append("os.version=10.15") + settings.append("os.version=10.9") settings.append("compiler=apple-clang") settings.append("compiler.libcxx=libc++") elif platform.system() == "Linux":