From 81e4f32d5002566c8913b455dbc9e1feef887c78 Mon Sep 17 00:00:00 2001
From: geruipu <greepar@outlook.com>
Date: Sun, 21 Jun 2026 03:21:26 +0800
Subject: [PATCH] Build AvaloniaNative before macOS graphics

---
 .github/workflows/macos-static-avalonia-native.yml | 6 +++---
 scripts/build-macos-avalonia-native-static.sh      | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/macos-static-avalonia-native.yml b/.github/workflows/macos-static-avalonia-native.yml
index 2184252..dd38545 100644
--- a/.github/workflows/macos-static-avalonia-native.yml
+++ b/.github/workflows/macos-static-avalonia-native.yml
@@ -34,12 +34,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Build macOS static graphics libraries
-        run: bash ./scripts/build-macos-static-graphics.sh all
-
       - name: Build static AvaloniaNative
         run: bash ./scripts/build-macos-avalonia-native-static.sh
 
+      - name: Build macOS static graphics libraries
+        run: bash ./scripts/build-macos-static-graphics.sh all
+
       - name: List native outputs
         run: find "External/NativeStatic/${{ matrix.rid }}/native" -maxdepth 1 -type f -print
 
diff --git a/scripts/build-macos-avalonia-native-static.sh b/scripts/build-macos-avalonia-native-static.sh
index 2f7ba1d..1c57973 100644
--- a/scripts/build-macos-avalonia-native-static.sh
+++ b/scripts/build-macos-avalonia-native-static.sh
@@ -22,6 +22,7 @@ if [[ ! -d "$src/.git" ]]; then
 fi
 
 project="$src/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj"
+include_dir="$src/native/Avalonia.Native/inc"
 build_dir="$WORK_DIR/avalonia-native-$RID"
 rm -rf "$build_dir"
 mkdir -p "$build_dir"
@@ -39,6 +40,7 @@ xcodebuild \
   EXECUTABLE_PREFIX=lib \
   EXECUTABLE_EXTENSION=a \
   PRODUCT_NAME=AvaloniaNative \
+  HEADER_SEARCH_PATHS="$include_dir" \
   CLANG_ENABLE_MODULES=YES \
   GCC_GENERATE_DEBUGGING_SYMBOLS=NO \
   -jobs "$BUILD_JOBS"