diff options
| author | lizzie <lizzie@eden-emu.dev> | 2026-04-06 19:13:09 +0200 |
|---|---|---|
| committer | crueter <crueter@eden-emu.dev> | 2026-04-06 19:13:09 +0200 |
| commit | 1f787ffc3984512853d0e583d22f7c96adf3c33c (patch) | |
| tree | 334df29903b2843025a346a224c5bb3c832ad94a /externals | |
| parent | 148dc7b4806a216663f347d489869b59dc13925e (diff) | |
[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>
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | externals/cpmfile.json | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 00bdf10a4f..ba0545b7a7 100644 --- a/externals/CMakeLists.txt +++ b/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) diff --git a/externals/cpmfile.json b/externals/cpmfile.json index f849426a4d..03303a5896 100644 --- a/externals/cpmfile.json +++ b/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": { |