diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index 883f8e4d..8da04c00 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -57,11 +57,6 @@ jobs: setup: | brew install llvm build: | - sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/*; - export CC=$(xcrun -f clang); - export CXX=$(xcrun -f clang++); - SYSROOT=$(xcrun --sdk macosx --show-sdk-path); - export CFLAGS="-isysroot $SYSROOT -isystem $SYSROOT"; export MACOSX_DEPLOYMENT_TARGET='11.0' export PATH="/opt/homebrew/opt/llvm/bin:$PATH" clang --version diff --git a/.github/workflows/cargo-test.yaml b/.github/workflows/cargo-test.yaml index 442553dd..5844e125 100644 --- a/.github/workflows/cargo-test.yaml +++ b/.github/workflows/cargo-test.yaml @@ -16,7 +16,7 @@ jobs: build: if: "!contains(github.event.head_commit.message, 'skip ci')" name: stable - macOS - cargo - test - runs-on: macos-latest + runs-on: macos-14 steps: - uses: actions/checkout@v4 diff --git a/build.rs b/build.rs index f71b92b8..736e2350 100644 --- a/build.rs +++ b/build.rs @@ -202,6 +202,11 @@ fn main() { } "macos" => { build.cpp_set_stdlib("c++"); + if compile_target_arch == "aarch64" { + build.flag("-mmacosx-version-min=11.0"); + } else { + build.flag("-mmacosx-version-min=10.13"); + } println!("cargo:rustc-link-lib=c++"); println!("cargo:rustc-link-lib=framework=ApplicationServices"); } diff --git a/skia-c/skia_c.hpp b/skia-c/skia_c.hpp index bd7d7fca..25754f24 100644 --- a/skia-c/skia_c.hpp +++ b/skia-c/skia_c.hpp @@ -82,9 +82,6 @@ typedef struct skiac_picture skiac_picture; #define SK_FONT_FILE_PREFIX "/usr/share/fonts/" #endif -sk_sp -SkFontMgr_New_Custom_Directory(const char *dir); - enum class CssBaseline { Top,