fix1

.ci/ios/build.sh

@@ -26,7 +26,6 @@ cmake -G Xcode -B build \
     -DYUZU_CMD=OFF \
     -DUSE_DISCORD_PRESENCE=OFF \
     -DYUZU_USE_EXTERNAL_FFMPEG=ON \
-    -DYUZU_USE_CPM=ON \
     -DYUZU_USE_EXTERNAL_SDL2=ON \
     -DCPMUTIL_FORCE_BUNDLED=ON \
     -DCMAKE_BUILD_TYPE=Release

CMakeLists.txt

@@ -277,7 +277,7 @@ if (YUZU_ROOM)
     add_compile_definitions(YUZU_ROOM)
 endif()
 
-if ((ANDROID OR APPLE OR UNIX) AND (NOT PLATFORM_LINUX OR ANDROID) AND NOT WIN32)
+if ((ANDROID OR APPLE OR UNIX OR IOS) AND (NOT PLATFORM_LINUX OR ANDROID) AND NOT WIN32)
     if(CXX_APPLE OR CXX_CLANG)
         # libc++ has stop_token and jthread as experimental
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexperimental-library")

docs/Caveats.md

@@ -6,6 +6,7 @@
 - [macOS](#macos)
 - [OpenIndiana](#openindiana)
 - [OmniOS](#omnios)
+- [iOS](#ios)
 - [HaikuOS](#haikuos)
 - [OpenBSD](#openbsd)
 - [FreeBSD](#freebsd)
@@ -93,6 +94,16 @@ You may also need to install `gmake` in order to properly build FFmpeg, this is
 
 If it wasn't obvious already, you require a X11 server to properly run the emulator within OmniOS, [this guide](https://web.archive.org/web/20260424200928/https://geekblood.wordpress.com/2017/10/26/installing-x11-and-a-desktop-environment-on-omnios/) is a great starting point for that, the links to pkgsrc are outdated so follow [this exemplar](https://pkgsrc.smartos.org/install-on-illumos/) as well:
 
+## iOS
+
+iOS has a dedicated build script, we **highly** recommend using that instead of doing anything else, we don't support any other configuration than the one present in said build script.
+
+To build, it's simply as easy as doing
+```sh
+chmod +x .ci/ios/build.sh
+.ci/ios/build.sh
+```
+
 ## HaikuOS
 
 It's recommended to do a `pkgman full-sync` before installing. See [HaikuOS: Installing applications](https://www.haiku-os.org/guides/daily-tasks/install-applications/). Sometimes the process may be interrupted by an error like "Interrupted syscall". Simply firing the command again fixes the issue. By default `g++` is included on the default installation.

externals/cmake-modules/DetectPlatform.cmake

@@ -51,6 +51,12 @@ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
     set(CXX_APPLE ON)
 endif()
 
+# This fixes some quirks with xcrun or weird iOS toolchain cmake files
+if (IOS)
+    unser(CXX_CLANG)
+    set(CXX_APPLE ON)
+endif()
+
 # https://gitlab.kitware.com/cmake/cmake/-/merge_requests/11112
 # This works totally fine on MinGW64, but not CLANG{,ARM}64
 if(MINGW AND CXX_CLANG)

externals/ffmpeg/CMakeLists.txt

@@ -203,15 +203,16 @@ else()
         )
     elseif(IOS)
         execute_process(COMMAND xcrun --sdk iphoneos --show-sdk-path OUTPUT_VARIABLE SYSROOT)
+        # Lovely extra newline apple adds that **we** must remove... thank you apple!
+        string(STRIP "${SYSROOT}" SYSROOT)
         set(FFmpeg_CC xcrun --sdk iphoneos clang -arch arm64)
         set(FFmpeg_CXX xcrun --sdk iphoneos clang++ -arch arm64)
         list(APPEND FFmpeg_CROSS_COMPILE_FLAGS
             --arch=arm64
             --enable-cross-compile
-            --sysroot=${SYSROOT}
-            --target-os=darwin
+            --sysroot="${SYSROOT}"
             --extra-ldflags="-miphoneos-version-min=16.0"
-            --install-name-dir="@rpath"
+            --install-name-dir='@rpath'
             --disable-audiotoolbox
         )
     endif()