Browse Source
cmake 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
2 changed files with
3 additions and
3 deletions
-
CMakeLists.txt
-
externals/cpmfile.json
|
|
@ -264,7 +264,7 @@ if (ENABLE_WEB_SERVICE) |
|
|
endif() |
|
|
endif() |
|
|
option(ENABLE_OPENSSL "Enable OpenSSL backend for ISslConnection" ${DEFAULT_ENABLE_OPENSSL}) |
|
|
option(ENABLE_OPENSSL "Enable OpenSSL backend for ISslConnection" ${DEFAULT_ENABLE_OPENSSL}) |
|
|
if (ENABLE_OPENSSL) |
|
|
if (ENABLE_OPENSSL) |
|
|
cmake_dependent_option(YUZU_USE_BUNDLED_OPENSSL "Download bundled OpenSSL build" ON "MSVC OR PLATFORM_SUN" OFF) |
|
|
|
|
|
|
|
|
cmake_dependent_option(YUZU_USE_BUNDLED_OPENSSL "Download bundled OpenSSL build" ON "NOT MSVC AND NOT PLATFORM_SUN" OFF) |
|
|
endif() |
|
|
endif() |
|
|
|
|
|
|
|
|
if (ANDROID AND YUZU_DOWNLOAD_ANDROID_VVL) |
|
|
if (ANDROID AND YUZU_DOWNLOAD_ANDROID_VVL) |
|
|
|
|
|
@ -46,8 +46,8 @@ |
|
|
"package": "xbyak", |
|
|
"package": "xbyak", |
|
|
"repo": "herumi/xbyak", |
|
|
"repo": "herumi/xbyak", |
|
|
"tag": "v%VERSION%", |
|
|
"tag": "v%VERSION%", |
|
|
"hash": "443c5c0f14182e46b07af18ee5bd631a0557c37c6b92f6b19a3100dcc8f7b8baa100b7f142fc182cb8d74537bd69459f1065b39078a8a8d02f247133c9c46be4", |
|
|
|
|
|
"git_version": "7.28", |
|
|
|
|
|
|
|
|
"hash": "b40dade90fb0e46a2bd52934f7ce461e37be931b571e58cbe2203bc08ed5b54c7ff1a29026c74c7f9805e4e3f6c9636deca528e6b4a8093ce7eae145218599f1", |
|
|
|
|
|
"git_version": "7.29", |
|
|
"bundled": true, |
|
|
"bundled": true, |
|
|
"skip_updates": true |
|
|
"skip_updates": true |
|
|
}, |
|
|
}, |
|
|
|
