From e8025b31aefae63c99b7b2b9fa2f9eb4ee6e5f50 Mon Sep 17 00:00:00 2001 From: lizzie Date: Thu, 26 Mar 2026 01:34:32 +0000 Subject: [PATCH] fix sirit i think, add ios-aarch64 --- CMakeModules/CPMUtil.cmake | 4 +++- externals/cpmfile.json | 5 ++++- src/ios/CMakeLists.txt | 6 ++++-- tools/cpm/package/fetch.sh | 1 + tools/cpm/package/util/interactive.sh | 1 + 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CMakeModules/CPMUtil.cmake b/CMakeModules/CPMUtil.cmake index b992f24083..4892db0626 100644 --- a/CMakeModules/CPMUtil.cmake +++ b/CMakeModules/CPMUtil.cmake @@ -690,8 +690,10 @@ function(AddCIPackage) set(pkgname linux-amd64) elseif(PLATFORM_LINUX AND ARCHITECTURE_arm64) set(pkgname linux-aarch64) - elseif(APPLE) + elseif(APPLE AND NOT IOS) set(pkgname macos-universal) + elseif(APPLE AND IOS AND ARCHITECTURE_arm64) + set(pkgname ios-aarch64) endif() if (DEFINED pkgname AND NOT "${pkgname}" IN_LIST DISABLED_PLATFORMS) diff --git a/externals/cpmfile.json b/externals/cpmfile.json index 66f5ee8a5a..f9f538e866 100644 --- a/externals/cpmfile.json +++ b/externals/cpmfile.json @@ -23,7 +23,10 @@ "package": "sirit", "name": "sirit", "repo": "eden-emulator/sirit", - "version": "1.0.4" + "version": "1.0.4", + "disabled_platforms": [ + "ios-aarch64" + ] }, "httplib": { "repo": "yhirose/cpp-httplib", diff --git a/src/ios/CMakeLists.txt b/src/ios/CMakeLists.txt index c8f15df3f8..54ff956a36 100644 --- a/src/ios/CMakeLists.txt +++ b/src/ios/CMakeLists.txt @@ -21,8 +21,10 @@ set_target_properties(eden-ios PROPERTIES XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "com.yuzu-emu.yuzu" XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "YUZU1234" XCODE_ATTRIBUTE_SWIFT_OBJC_BRIDGING_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/AppUI-Bridging-Header.h" + XCODE_ATTRIBUTE_SWIFT_OBJC_INTERFACE_HEADER_NAME "eden-ios-Swift.h" + XCODE_ATTRIBUTE_DERIVED_FILE_DIR "${CMAKE_CURRENT_BINARY_DIR}" ) -target_link_libraries(eden-ios PRIVATE common core input_common frontend_common video_core) +target_link_libraries(eden-ios PRIVATE common core input_common frontend_common video_core sirit::sirit) target_link_libraries(eden-ios PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) -target_link_libraries(eden-ios PRIVATE SDL2::SDL2 glad sirit::sirit) +target_link_libraries(eden-ios PRIVATE SDL2::SDL2 glad) create_target_directory_groups(eden-ios) diff --git a/tools/cpm/package/fetch.sh b/tools/cpm/package/fetch.sh index b03a824146..3baf35c079 100755 --- a/tools/cpm/package/fetch.sh +++ b/tools/cpm/package/fetch.sh @@ -83,6 +83,7 @@ ci_package() { android-aarch64 android-x86_64 \ solaris-amd64 freebsd-amd64 openbsd-amd64 \ linux-amd64 linux-aarch64 \ + ios-aarch64 \ macos-universal; do echo "-- * platform $platform" diff --git a/tools/cpm/package/util/interactive.sh b/tools/cpm/package/util/interactive.sh index 99db77e20d..80a3685cc6 100755 --- a/tools/cpm/package/util/interactive.sh +++ b/tools/cpm/package/util/interactive.sh @@ -151,6 +151,7 @@ mingw-amd64 mingw-arm64 android-aarch64 android-x86_64 solaris-amd64 freebsd-amd64 openbsd-amd64 linux-amd64 linux-aarch64 +ios-aarch64 macos-universal" DISABLED_PLATFORMS="$reply"