Browse Source

fix sirit i think, add ios-aarch64

lizzie/ios-port-sud
lizzie 3 months ago
parent
commit
c89a4d8b03
  1. 4
      CMakeModules/CPMUtil.cmake
  2. 5
      externals/cpmfile.json
  3. 6
      src/ios/CMakeLists.txt
  4. 1
      tools/cpm/package/fetch.sh
  5. 1
      tools/cpm/package/util/interactive.sh

4
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)

5
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",

6
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)

1
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"

1
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"

Loading…
Cancel
Save