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

@@ -283,7 +283,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

@@ -4,6 +4,7 @@
 - [Arch Linux](#arch-linux)
 - [Gentoo Linux](#gentoo-linux)
 - [macOS](#macos)
+- [iOS](#ios)
 - [Solaris](#solaris)
 - [HaikuOS](#haikuos)
 - [OpenBSD](#openbsd)
@@ -31,6 +32,16 @@ If you're having issues with building, always consult that ebuild.
 
 macOS is largely untested. Expect crashes, significant Vulkan issues, and other fun stuff.
 
+## 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
+```
+
 ## Solaris
 
 Always consult [the OpenIndiana package list](https://pkg.openindiana.org/hipster/en/index.shtml) to cross-verify availability.

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