diff --git a/CMakeLists.txt b/CMakeLists.txt index 9faa2dad64..43482e7e78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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" 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() if (ANDROID AND YUZU_DOWNLOAD_ANDROID_VVL) diff --git a/externals/cpmfile.json b/externals/cpmfile.json index 11196caf3d..27f8afb42e 100644 --- a/externals/cpmfile.json +++ b/externals/cpmfile.json @@ -46,8 +46,8 @@ "package": "xbyak", "repo": "herumi/xbyak", "tag": "v%VERSION%", - "hash": "443c5c0f14182e46b07af18ee5bd631a0557c37c6b92f6b19a3100dcc8f7b8baa100b7f142fc182cb8d74537bd69459f1065b39078a8a8d02f247133c9c46be4", - "git_version": "7.28", + "hash": "b40dade90fb0e46a2bd52934f7ce461e37be931b571e58cbe2203bc08ed5b54c7ff1a29026c74c7f9805e4e3f6c9636deca528e6b4a8093ce7eae145218599f1", + "git_version": "7.29", "bundled": true, "skip_updates": true },