From 70204e90478aae7aa62bc8a85307231fceabb6fa Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Sat, 1 Nov 2025 17:36:59 +0800
Subject: [PATCH] build: try to fix macos package

https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/14595
---
 .github/workflows/ci.yml            | 1 +
 .github/workflows/smoke-testing.yml | 2 ++
 .gitignore                          | 1 +
 cmake/macos.cmake                   | 6 ++++++
 tools/build_macos_universal.zsh     | 1 +
 5 files changed, 11 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4bec47f195..1ea0da3295 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -479,6 +479,7 @@ jobs:
       - name: Build XCFramework
         run: |
           xcodebuild -create-xcframework -library libMaaCore.dylib -headers ../include -output MaaCore.xcframework
+          xcodebuild -create-xcframework -library libMaaUtils.dylib -headers ../include -output MaaCore.xcframework
           xcodebuild -create-xcframework -library libfastdeploy_ppocr.dylib -output fastdeploy_ppocr.xcframework
           xcodebuild -create-xcframework -library libonnxruntime.*.dylib -output ONNXRuntime.xcframework
           xcodebuild -create-xcframework -library libopencv*.dylib -output OpenCV.xcframework
diff --git a/.github/workflows/smoke-testing.yml b/.github/workflows/smoke-testing.yml
index 75fe78e0a0..a1da6e5d3a 100644
--- a/.github/workflows/smoke-testing.yml
+++ b/.github/workflows/smoke-testing.yml
@@ -56,6 +56,7 @@ jobs:
           path: |
             ./install/libfastdeploy_ppocr.dylib
             ./install/libMaaCore.dylib
+            ./install/libMaaUtils.dylib
             ./install/libonnxruntime.1.19.2.dylib
             ./install/libopencv_world4.4.11.0.dylib
             ./install/smoke_test
@@ -118,6 +119,7 @@ jobs:
           key: ${{ steps.cache_key.outputs.key }}
           path: |
             ./install/libfastdeploy_ppocr.dylib
+            ./install/libMaaUtils.dylib
             ./install/libMaaCore.dylib
             ./install/libonnxruntime.1.19.2.dylib
             ./install/libopencv_world4.4.11.0.dylib
diff --git a/.gitignore b/.gitignore
index a96f0dcf42..4126c9c26b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -457,6 +457,7 @@ tools/RoguelikeRecruitmentTool/output
 .lycheecache
 
 # MaaDeps
+MaaDeps
 src/MaaUtils/*
 
 # ResourceUpdater workflow
diff --git a/cmake/macos.cmake b/cmake/macos.cmake
index c243519410..5a91f48b1f 100644
--- a/cmake/macos.cmake
+++ b/cmake/macos.cmake
@@ -4,6 +4,12 @@ if (BUILD_XCFRAMEWORK)
         COMMAND xcodebuild -create-xcframework -library libMaaCore.dylib -headers ${PROJECT_SOURCE_DIR}/include -output MaaCore.xcframework
         DEPENDS MaaCore
     )
+    
+    add_custom_command(OUTPUT MaaCore.xcframework
+        COMMAND rm -rf MaaCore.xcframework
+        COMMAND xcodebuild -create-xcframework -library libMaaUtils.dylib -output libMaaUtils.xcframework
+        DEPENDS MaaCore
+    )
 
     add_custom_command(OUTPUT OpenCV.xcframework
         COMMAND rm -rf OpenCV.xcframework
diff --git a/tools/build_macos_universal.zsh b/tools/build_macos_universal.zsh
index bed0b0b111..5bb3d12c31 100755
--- a/tools/build_macos_universal.zsh
+++ b/tools/build_macos_universal.zsh
@@ -45,6 +45,7 @@ cp build-"${arch}"/compile_commands.json build
 
 pushd build
 xcodebuild -create-xcframework -library libMaaCore.dylib -headers ../include -output MaaCore.xcframework
+xcodebuild -create-xcframework -library libMaaUtils.dylib -output libMaaUtils.xcframework
 xcodebuild -create-xcframework -library libfastdeploy_ppocr.dylib -output fastdeploy_ppocr.xcframework
 xcodebuild -create-xcframework -library libonnxruntime.*.dylib -output ONNXRuntime.xcframework
 xcodebuild -create-xcframework -library libopencv*.dylib -output OpenCV.xcframework