diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c82311c3..6a2a99d6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,7 +43,7 @@ jobs:
- { name: 'msys2 mingw32', os: 'windows-latest', generator: 'Ninja', dx5: false, config: false, mingw: true, werror: true, clang-tidy: true, msystem: 'mingw32', msys-env: 'mingw-w64-i686', shell: 'msys2 {0}' }
- { name: 'msys2 mingw64', os: 'windows-latest', generator: 'Ninja', dx5: false, config: true, mingw: true, werror: true, clang-tidy: true, msystem: 'mingw64', msys-env: 'mingw-w64-x86_64', shell: 'msys2 {0}' }
- { name: 'macOS', os: 'macos-latest', generator: 'Ninja', dx5: false, config: true, brew: true, werror: true, clang-tidy: false }
- - { name: 'iOS', os: 'macos-15', generator: 'Xcode', dx5: false, config: false, brew: true, werror: true, clang-tidy: false, cmake-args: '-DCMAKE_SYSTEM_NAME=iOS' }
+ - { name: 'iOS', os: 'macos-15', generator: 'Xcode', dx5: false, config: false, brew: true, werror: true, clang-tidy: false, cmake-args: '-DCMAKE_SYSTEM_NAME=iOS', ios: true }
- { name: 'Emscripten', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: false, emsdk: true, werror: true, clang-tidy: false, cmake-wrapper: 'emcmake' }
- { name: 'Nintendo 3DS', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: false, n3ds: true, werror: true, clang-tidy: false, container: 'devkitpro/devkitarm:latest', cmake-args: '-DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/3DS.cmake' }
- { name: 'Xbox One', os: 'windows-latest', generator: 'Visual Studio 17 2022', dx5: false, config: false, msvc: true, werror: false, clang-tidy: false, vc-arch: 'amd64', cmake-args: '-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0.26100.0', xbox-one: true}
@@ -95,6 +95,12 @@ jobs:
brew update
brew install cmake ninja llvm qt6
echo "LLVM_ROOT=$(brew --prefix llvm)/bin" >> $GITHUB_ENV
+
+ - name: Use latest Xcode
+ if: ${{ matrix.ios }}
+ uses: maxim-lobanov/setup-xcode@v1.6.0
+ with:
+ xcode-version: latest-stable
- name: Setup Emscripten
uses: mymindstorm/setup-emsdk@master
diff --git a/packaging/ios/CMakeLists.txt b/packaging/ios/CMakeLists.txt
index 418ad518..834b75d6 100644
--- a/packaging/ios/CMakeLists.txt
+++ b/packaging/ios/CMakeLists.txt
@@ -15,7 +15,7 @@ if(ISLE_BUILD_APP)
"${CMAKE_CURRENT_BINARY_DIR}/isle/Info.plist"
@ONLY
)
- set(RESOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/isle/LaunchScreen.storyboard" "${CMAKE_CURRENT_SOURCE_DIR}/isle/Assets.xcassets")
+ set(RESOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/isle/Assets.xcassets")
target_sources(${ISLE_TARGET_NAME} PRIVATE ${RESOURCE_FILES})
set_source_files_properties(${RESOURCE_FILES}
TARGET_DIRECTORY isle
diff --git a/packaging/ios/isle/Info.plist.in b/packaging/ios/isle/Info.plist.in
index 714324a3..c5d5a80b 100644
--- a/packaging/ios/isle/Info.plist.in
+++ b/packaging/ios/isle/Info.plist.in
@@ -27,7 +27,7 @@
CFBundleVersion
@MACOSX_BUNDLE_BUNDLE_VERSION@
UILaunchStoryboardName
- LaunchScreen
+
NSHighResolutionCapable
CSResourcesFileMapped
diff --git a/packaging/ios/isle/LaunchScreen.storyboard b/packaging/ios/isle/LaunchScreen.storyboard
deleted file mode 100644
index ad167a8a..00000000
--- a/packaging/ios/isle/LaunchScreen.storyboard
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-