[cmake, deps] conjure common/httplib.h and remove global def for httplib macros (#3800)

httplib stuff done by @crueter on #3797

+ some extra stuff since the warning push/pop should be in header i fear :)

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

Co-authored-by: crueter <crueter@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3800
Reviewed-by: crueter <crueter@eden-emu.dev>
Co-authored-by: lizzie <lizzie@eden-emu.dev>
Co-committed-by: lizzie <lizzie@eden-emu.dev>

externals/CMakeLists.txt

@@ -62,6 +62,12 @@ endif()
 # unordered_dense
 AddJsonPackage(unordered-dense)
 
+# httplib
+if (IOS)
+    set(HTTPLIB_USE_BROTLI_IF_AVAILABLE OFF)
+endif()
+AddJsonPackage(httplib)
+
 if (YUZU_STATIC_ROOM)
     return()
 endif()
@@ -227,9 +233,6 @@ if (VulkanMemoryAllocator_ADDED)
     endif()
 endif()
 
-# httplib
-AddJsonPackage(httplib)
-
 # cpp-jwt
 if (ENABLE_WEB_SERVICE OR ENABLE_UPDATE_CHECKER)
     AddJsonPackage(cpp-jwt)

externals/cpmfile.json

@@ -36,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,18 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#define CPPHTTPLIB_DISABLE_MACOSX_AUTOMATIC_ROOT_CERTIFICATES 1
+#define CPPHTTPLIB_OPENSSL_SUPPORT 1
+
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#ifndef __clang__
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
+#endif
+#include <httplib.h>
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif

src/core/CMakeLists.txt

@@ -1269,7 +1269,6 @@ endif()
 target_sources(core PRIVATE hle/service/ssl/ssl_backend_openssl.cpp)
 
 target_link_libraries(core PRIVATE OpenSSL::SSL OpenSSL::Crypto)
-target_compile_definitions(core PRIVATE CPPHTTPLIB_OPENSSL_SUPPORT)
 
 # 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>
@@ -103,8 +101,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,8 +124,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 {};
 }
 
@@ -232,8 +226,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 +247,6 @@ std::optional<std::string> DownloadReleasesJson() {
     } catch (...) {
         LOG_WARNING(Service_BCAT, " failed to download releases");
     }
-#endif
     return std::nullopt;
 }
 

src/frontend_common/CMakeLists.txt

@@ -22,8 +22,6 @@ if (ENABLE_UPDATE_CHECKER)
     target_sources(frontend_common PRIVATE
         update_checker.cpp
         update_checker.h)
-
-    target_compile_definitions(frontend_common PUBLIC CPPHTTPLIB_OPENSSL_SUPPORT)
     target_link_libraries(frontend_common PRIVATE OpenSSL::SSL OpenSSL::Crypto)
 endif()
 

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/qt_common/CMakeLists.txt

@@ -50,7 +50,6 @@ if (USE_DISCORD_PRESENCE)
 
     if (YUZU_USE_BUNDLED_OPENSSL)
         target_link_libraries(qt_common PUBLIC OpenSSL::SSL OpenSSL::Crypto)
-        target_compile_definitions(qt_common PRIVATE CPPHTTPLIB_OPENSSL_SUPPORT)
     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/web_service/CMakeLists.txt

@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 # SPDX-FileCopyrightText: 2018 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -19,4 +22,3 @@ target_link_libraries(web_service PRIVATE common network nlohmann_json::nlohmann
 
 find_package(OpenSSL REQUIRED)
 target_link_libraries(web_service PRIVATE OpenSSL::SSL OpenSSL::Crypto)
-target_compile_definitions(web_service PRIVATE CPPHTTPLIB_OPENSSL_SUPPORT)

src/web_service/web_backend.cpp

@@ -9,17 +9,7 @@
 #include <string>
 
 #include <fmt/ranges.h>
-
+#include "common/httplib.h"
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#ifndef __clang__
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif
-#endif
-#include <httplib.h>
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
 
 #ifdef YUZU_BUNDLED_OPENSSL
 #include <openssl/cert.h>