Fix most build errors

Signed-off-by: crueter <crueter@eden-emu.dev>

.ci/ios/build.sh

@@ -6,9 +6,9 @@
 WORK_DIR="$PWD"
 xcrun --sdk iphoneos --show-sdk-path
 
-# TODO(crueter): FFmpeg for iOS
+# TODO: support iphonesimulator sdk
 
-cmake -G Xcode -B build \
+cmake -G Xcode -B build/ios \
     -DCMAKE_TOOLCHAIN_FILE="$WORK_DIR/.ci/ios/ios-toolchain.cmake" \
     -DPLATFORM=OS64 \
     -DARCHS="arm64" \
@@ -19,8 +19,7 @@ cmake -G Xcode -B build \
     -DENABLE_QT=OFF \
     -DENABLE_WEB_SERVICE=OFF \
     -DENABLE_CUBEB=OFF \
-    -DYUZU_USE_EXTERNAL_FFMPEG=ON \
+    -DCMAKE_BUILD_TYPE=Release \
-    -DYUZU_USE_EXTERNAL_SDL2=ON \
+    "$@"
-    -DCMAKE_BUILD_TYPE=Release
 
-cmake --build build -t eden-ios
+cmake --build build/ios -t eden-ios --config Release

.ci/ios/ios-toolchain.cmake

@@ -157,7 +157,7 @@
 #   command.
 #
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.10)
 
 # CMake invokes the toolchain file twice during the first build, but only once during subsequent rebuilds.
 # NOTE: To improve single-library build-times, provide the flag "OS_SINGLE_BUILD" as a build argument.

CMakeLists.txt

@@ -170,24 +170,24 @@ if (MSVC AND NOT CXX_CLANG)
     set(CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS_INIT} /W3 /WX-")
 endif()
 
-# TODO(crueter): Cleanup, each dep that has a bundled option should allow to choose between bundled, external, system
-cmake_dependent_option(YUZU_USE_EXTERNAL_SDL2 "Build SDL2 from external source" OFF "NOT MSVC;NOT ANDROID" OFF)
-cmake_dependent_option(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 build" "${MSVC}" "NOT ANDROID" OFF)
-
-option(ENABLE_CUBEB "Enables the cubeb audio backend" ON)
-
 set(EXT_DEFAULT OFF)
 if (MSVC OR ANDROID OR IOS)
     set(EXT_DEFAULT ON)
 endif()
 
+# TODO(crueter): Cleanup, each dep that has a bundled option should allow to choose between bundled, external, system
+cmake_dependent_option(YUZU_USE_EXTERNAL_SDL2 "Build SDL2 from external source" OFF "NOT MSVC;NOT ANDROID" OFF)
+cmake_dependent_option(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 build" "${EXT_DEFAULT}" "NOT ANDROID" OFF)
+
+option(ENABLE_CUBEB "Enables the cubeb audio backend" ON)
+
 # ffmpeg
 option(YUZU_USE_BUNDLED_FFMPEG "Download bundled FFmpeg" ${EXT_DEFAULT})
 cmake_dependent_option(YUZU_USE_EXTERNAL_FFMPEG "Build FFmpeg from external source" "${PLATFORM_SUN}" "NOT WIN32 AND NOT ANDROID" OFF)
 
 # sirit
 set(BUNDLED_SIRIT_DEFAULT OFF)
-if ((MSVC AND NOT (CMAKE_BUILD_TYPE MATCHES "Deb")) OR ANDROID)
+if ((MSVC AND NOT (CMAKE_BUILD_TYPE MATCHES "Deb")) OR ANDROID OR IOS)
     set(BUNDLED_SIRIT_DEFAULT ON)
 endif()
 

externals/CMakeLists.txt

@@ -228,6 +228,10 @@ if (VulkanMemoryAllocator_ADDED)
 endif()
 
 # httplib
+if (IOS)
+    set(HTTPLIB_USE_BROTLI_IF_AVAILABLE OFF)
+endif()
+
 AddJsonPackage(httplib)
 
 # cpp-jwt

externals/cmake-modules/DetectArchitecture.cmake

@@ -41,12 +41,12 @@ if (CMAKE_OSX_ARCHITECTURES)
     if (IOS)
         # TODO: Right... the toolchain file won't properly accomodate OSX_ARCHITECTURE
         # they aren't defining it as a list properly I assume?
-        set(ARCHITECTURE_arm64 1 PARENT_SCOPE)
+        set(ARCHITECTURE_arm64 1)
         add_definitions(-DARCHITECTURE_arm64=1)
     else ()
         # hope and pray the architecture names match
-        foreach(ARCH IN ${CMAKE_OSX_ARCHITECTURES})
+        foreach(ARCH ${CMAKE_OSX_ARCHITECTURES})
-            set(ARCHITECTURE_${ARCH} 1 PARENT_SCOPE)
+            set(ARCHITECTURE_${ARCH} 1)
             add_definitions(-DARCHITECTURE_${ARCH}=1)
         endforeach()
     endif()
@@ -223,4 +223,4 @@ if (NOT DEFINED ARCHITECTURE)
     add_definitions(-DARCHITECTURE_GENERIC=1)
 endif()
 
-message(STATUS "[DetectArchitecture] Target architecture: ${ARCHITECTURE}")
+message(STATUS "[DetectArchitecture] Target architecture: ${ARCHITECTURE}")

externals/cpmfile.json

@@ -23,10 +23,7 @@
         "package": "sirit",
         "name": "sirit",
         "repo": "eden-emulator/sirit",
-        "version": "1.0.4",
+        "version": "1.0.5"
-        "disabled_platforms": [
-            "ios-aarch64"
-        ]
     },
     "httplib": {
         "repo": "yhirose/cpp-httplib",
@@ -39,7 +36,8 @@
             "0002-fix-zstd.patch"
         ],
         "options": [
-            "HTTPLIB_REQUIRE_OPENSSL ON"
+            "HTTPLIB_REQUIRE_OPENSSL ON",
+            "HTTPLIB_DISABLE_MACOSX_AUTOMATIC_ROOT_CERTIFICATES ON"
         ]
     },
     "cpp-jwt": {

src/common/CMakeLists.txt

@@ -146,7 +146,8 @@ add_library(
     zstd_compression.cpp
     zstd_compression.h
     fs/ryujinx_compat.h fs/ryujinx_compat.cpp
-    fs/symlink.h fs/symlink.cpp)
+    fs/symlink.h fs/symlink.cpp
+    httplib.h)
 
 if(WIN32)
     target_sources(common PRIVATE windows/timer_resolution.cpp
@@ -244,7 +245,7 @@ else()
     target_link_libraries(common PUBLIC Boost::headers)
 endif()
 
-target_link_libraries(common PUBLIC Boost::filesystem Boost::context)
+target_link_libraries(common PUBLIC Boost::filesystem Boost::context httplib::httplib)
 
 if (lz4_ADDED)
     target_include_directories(common PRIVATE ${lz4_SOURCE_DIR}/lib)

src/common/httplib.h

@@ -0,0 +1,9 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#define CPPHTTPLIB_DISABLE_MACOSX_AUTOMATIC_ROOT_CERTIFICATES
+#define CPPHTTPLIB_OPENSSL_SUPPORT
+
+#include <httplib.h>

src/core/CMakeLists.txt

@@ -1273,9 +1273,6 @@ endif()
 target_sources(core PRIVATE hle/service/ssl/ssl_backend_openssl.cpp)
 
 target_link_libraries(core PRIVATE OpenSSL::SSL OpenSSL::Crypto)
-if (NOT IOS)
-    target_compile_definitions(core PRIVATE CPPHTTPLIB_OPENSSL_SUPPORT)
-endif()
 
 # TODO
 

src/core/hle/service/bcat/news/builtin_news.cpp

@@ -15,9 +15,7 @@
 #include <fmt/format.h>
 #include <nlohmann/json.hpp>
 
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+#include "common/httplib.h"
-#include <httplib.h>
-#endif
 
 #include <chrono>
 #include <cstring>
@@ -104,7 +102,6 @@ std::vector<u8> TryLoadFromDisk(const std::filesystem::path& path) {
 std::vector<u8> DownloadImage(const std::string& url_path, const std::filesystem::path& cache_path) {
     LOG_INFO(Service_BCAT, "Downloading image: https://eden-emu.dev{}", url_path);
 
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
     try {
         httplib::Client cli("https://eden-emu.dev");
         cli.set_follow_location(true);
@@ -128,7 +125,6 @@ std::vector<u8> DownloadImage(const std::string& url_path, const std::filesystem
     } catch (...) {
         LOG_WARNING(Service_BCAT, "Failed to download: {}", url_path);
     }
-#endif
 
     return {};
 }
@@ -233,7 +229,6 @@ void WriteCachedJson(std::string_view json) {
 
 std::optional<std::string> DownloadReleasesJson() {
 
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
     try {
         httplib::SSLClient cli{"api.github.com", 443};
         cli.set_connection_timeout(10);
@@ -255,7 +250,7 @@ std::optional<std::string> DownloadReleasesJson() {
     } catch (...) {
         LOG_WARNING(Service_BCAT, " failed to download releases");
     }
-#endif
+
     return std::nullopt;
 }
 

src/frontend_common/CMakeLists.txt

@@ -23,9 +23,6 @@ if (ENABLE_UPDATE_CHECKER)
         update_checker.cpp
         update_checker.h)
     target_link_libraries(frontend_common PRIVATE OpenSSL::SSL OpenSSL::Crypto)
-    if (NOT IOS)
-        target_compile_definitions(frontend_common PUBLIC CPPHTTPLIB_OPENSSL_SUPPORT)
-    endif()
 endif()
 
 create_target_directory_groups(frontend_common)

src/frontend_common/update_checker.cpp

@@ -13,7 +13,7 @@
 #include "common/scm_rev.h"
 #include "update_checker.h"
 
-#include <httplib.h>
+#include "common/httplib.h"
 
 #ifdef YUZU_BUNDLED_OPENSSL
 #include <openssl/cert.h>

src/ios/CMakeLists.txt

@@ -15,6 +15,7 @@ add_executable(eden-ios
     EmulationSession.mm
     EmulationWindow.h
     EmulationWindow.mm
+    VMA.cpp
 )
 # Keep bundle identifier as-is, for compatibility sake
 set_target_properties(eden-ios PROPERTIES
@@ -26,5 +27,5 @@ set_target_properties(eden-ios PROPERTIES
 )
 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)
+target_link_libraries(eden-ios PRIVATE SDL2::SDL2 glad stb::headers)
 create_target_directory_groups(eden-ios)

src/ios/VMA.cpp

@@ -0,0 +1,5 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#define VMA_IMPLEMENTATION
+#include "video_core/vulkan_common/vma.h"

src/qt_common/CMakeLists.txt

@@ -50,9 +50,6 @@ if (USE_DISCORD_PRESENCE)
 
     if (YUZU_USE_BUNDLED_OPENSSL)
         target_link_libraries(qt_common PUBLIC OpenSSL::SSL OpenSSL::Crypto)
-        if (NOT IOS)
-            target_compile_definitions(qt_common PRIVATE CPPHTTPLIB_OPENSSL_SUPPORT)
-        endif()
     endif()
 
     target_compile_definitions(qt_common PUBLIC USE_DISCORD_PRESENCE)

src/qt_common/discord/discord_impl.cpp

@@ -9,7 +9,7 @@
 
 #include <QEventLoop>
 #include <boost/algorithm/string/replace.hpp>
-#include <httplib.h>
+#include "common/httplib.h"
 
 #include <discord_rpc.h>
 #include <fmt/format.h>

src/video_core/vulkan_common/vma.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
@@ -13,9 +13,14 @@
 #ifdef _MSC_VER
 #pragma warning( push )
 #pragma warning( disable : 4189 )
+#elif defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-variable"
 #endif
 #include "vk_mem_alloc.h"
 
 #ifdef _MSC_VER
 #pragma warning( pop )
+#elif defined(__clang__)
+#pragma clang diagnostic pop
 #endif

src/web_service/CMakeLists.txt

@@ -20,27 +20,6 @@ create_target_directory_groups(web_service)
 target_include_directories(web_service PUBLIC ${cpp-jwt_SOURCE_DIR}/include)
 target_link_libraries(web_service PRIVATE common network nlohmann_json::nlohmann_json httplib::httplib cpp-jwt::cpp-jwt)
 
-if (IOS)
+find_package(OpenSSL REQUIRED)
-    # TODO: this is horrific
+target_link_libraries(web_service PRIVATE OpenSSL::SSL OpenSSL::Crypto)
-    find_package(OpenSSL 3 QUIET)
+target_compile_definitions(web_service PRIVATE CPPHTTPLIB_OPENSSL_SUPPORT)
-    if (OpenSSL_FOUND)
-        target_link_libraries(web_service PRIVATE OpenSSL::SSL OpenSSL::Crypto)
-        if (NOT IOS)
-            target_compile_definitions(web_service PRIVATE CPPHTTPLIB_OPENSSL_SUPPORT)
-        endif()
-    else()
-        find_package(OpenSSL 3 QUIET PATHS /usr/local/opt/openssl /opt/homebrew/opt/openssl NO_DEFAULT_PATH)
-        if (OpenSSL_FOUND)
-            target_link_libraries(web_service PRIVATE OpenSSL::SSL OpenSSL::Crypto)
-            if (NOT IOS)
-                target_compile_definitions(web_service PRIVATE CPPHTTPLIB_OPENSSL_SUPPORT)
-            endif()
-        else()
-            message(WARNING "OpenSSL not found or version is less than 3. Some features in web_service may be disabled.")
-        endif()
-    endif()
-else()
-    find_package(OpenSSL REQUIRED)
-    target_link_libraries(web_service PRIVATE OpenSSL::SSL OpenSSL::Crypto)
-    target_compile_definitions(web_service PRIVATE CPPHTTPLIB_OPENSSL_SUPPORT)
-endif()

src/web_service/web_backend.cpp

@@ -16,7 +16,7 @@
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
 #endif
-#include <httplib.h>
+#include "common/httplib.h"
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
 #endif