Browse Source
[compat] solaris build fixes
Signed-off-by: lizzie <lizzie@eden-emu.dev>
pull/2752/head
lizzie
5 months ago
No known key found for this signature in database
GPG Key ID: 287378CADCAB13
3 changed files with
16 additions and
3 deletions
-
.patch/catch2/0001-solaris-isnan-fix.patch
-
CMakeLists.txt
-
externals/cpmfile.json
|
|
|
@ -0,0 +1,12 @@ |
|
|
|
diff --git a/src/catch2/matchers/catch_matchers_floating_point.cpp b/src/catch2/matchers/catch_matchers_floating_point.cpp
|
|
|
|
index fc7b444..0e1a3c2 100644
|
|
|
|
--- a/src/catch2/matchers/catch_matchers_floating_point.cpp
|
|
|
|
+++ b/src/catch2/matchers/catch_matchers_floating_point.cpp
|
|
|
|
@@ -5,6 +5,7 @@
|
|
|
|
// https://www.boost.org/LICENSE_1_0.txt) |
|
|
|
|
|
|
|
// SPDX-License-Identifier: BSL-1.0 |
|
|
|
+#include <catch2/internal/catch_polyfills.hpp>
|
|
|
|
#include <catch2/matchers/catch_matchers_floating_point.hpp> |
|
|
|
#include <catch2/internal/catch_enforce.hpp> |
|
|
|
#include <catch2/internal/catch_polyfills.hpp> |
|
|
|
@ -264,7 +264,7 @@ if (ENABLE_WEB_SERVICE) |
|
|
|
endif() |
|
|
|
option(ENABLE_OPENSSL "Enable OpenSSL backend for ISslConnection" ${DEFAULT_ENABLE_OPENSSL}) |
|
|
|
if (ENABLE_OPENSSL) |
|
|
|
cmake_dependent_option(YUZU_USE_BUNDLED_OPENSSL "Download bundled OpenSSL build" "${MSVC}" "NOT ANDROID" ON) |
|
|
|
cmake_dependent_option(YUZU_USE_BUNDLED_OPENSSL "Download bundled OpenSSL build" ON "MSVC OR PLATFORM_SUN" OFF) |
|
|
|
endif() |
|
|
|
|
|
|
|
if (ANDROID AND YUZU_DOWNLOAD_ANDROID_VVL) |
|
|
|
|
|
|
|
@ -46,9 +46,10 @@ |
|
|
|
"package": "xbyak", |
|
|
|
"repo": "herumi/xbyak", |
|
|
|
"tag": "v%VERSION%", |
|
|
|
"hash": "e84992c65ad62c577e2746ec5180132fd2875166d1e6b1521a0ff619787e1645792fe5f6a858fe94ed66f297912b6a6b89a509b5d5f5e81a2db1dd7e6790b1f5", |
|
|
|
"hash": "443c5c0f14182e46b07af18ee5bd631a0557c37c6b92f6b19a3100dcc8f7b8baa100b7f142fc182cb8d74537bd69459f1065b39078a8a8d02f247133c9c46be4", |
|
|
|
"git_version": "7.28", |
|
|
|
"bundled": true, |
|
|
|
"git_version": "7.30" |
|
|
|
"skip_updates": true |
|
|
|
}, |
|
|
|
"xbyak": { |
|
|
|
"package": "xbyak", |
|
|
|
|