eden-emu/eden
24
3
Fork 15
Code Issues 138 Pull requests 56 Projects 1 Releases Packages Wiki Activity Actions

[cmake] fix windows build, explicit shared lib settings
All checks were successful
eden-license / license-header (pull_request) Successful in 26s
Details

Browse source 
Signed-off-by: crueter <crueter@crueter.xyz>
This commit is contained in:
crueter 2025-08-19 14:19:34 -04:00
parent 0bcb3144eb
commit d7319a3da2
Signed by: crueter
GPG key ID: 425ACD2D4830EBC6
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
CMakeLists.txt
View file

@ -400,6 +400,7 @@ if (YUZU_USE_CPM)
if (MSVC AND ARCHITECTURE_x86_64)
set(DOWNLOAD_ONLY OFF)
set(BUILD_SHARED_LIBS OFF)
else()
set(DOWNLOAD_ONLY ON)
endif()
@ -420,6 +421,8 @@ if (YUZU_USE_CPM)
if (NOT DOWNLOAD_ONLY)
set(OPENSSL_DIR ${OpenSSL-windows-amd64_SOURCE_DIR})
endif()
message("OPENSSL ${DOWNLOAD_ONLY} ${OPENSSL_DIR}")
endif()
if ((MSVC AND ARCHITECTURE_arm64) OR FORCE_DOWNLOAD_OPENSSL)
@ -428,6 +431,7 @@ if (YUZU_USE_CPM)
if (MSVC AND ARCHITECTURE_arm64)
set(DOWNLOAD_ONLY OFF)
set(BUILD_SHARED_LIBS OFF)
else()
set(DOWNLOAD_ONLY ON)
endif()
@ -453,6 +457,7 @@ if (YUZU_USE_CPM)
if (ANDROID OR FORCE_DOWNLOAD_OPENSSL)
if (ANDROID)
set(DOWNLOAD_ONLY OFF)
set(BUILD_SHARED_LIBS OFF)
else()
set(DOWNLOAD_ONLY ON)
endif()
@ -478,6 +483,7 @@ if (YUZU_USE_CPM)
if(PLATFORM_SUN OR FORCE_DOWNLOAD_OPENSSL)
if (PLATFORM_SUN)
set(DOWNLOAD_ONLY OFF)
set(BUILD_SHARED_LIBS OFF)
else()
set(DOWNLOAD_ONLY ON)
endif()
@ -503,6 +509,7 @@ if (YUZU_USE_CPM)
if(PLATFORM_FREEBSD OR FORCE_DOWNLOAD_OPENSSL)
if (PLATFORM_FREEBSD)
set(DOWNLOAD_ONLY OFF)
set(BUILD_SHARED_LIBS OFF)
else()
set(DOWNLOAD_ONLY ON)
endif()
@ -528,6 +535,7 @@ if (YUZU_USE_CPM)
if(PLATFORM_LINUX OR FORCE_DOWNLOAD_OPENSSL)
if (PLATFORM_LINUX)
set(DOWNLOAD_ONLY OFF)
set(BUILD_SHARED_LIBS OFF)
else()
set(DOWNLOAD_ONLY ON)
endif()
@ -552,7 +560,6 @@ if (YUZU_USE_CPM)
if (DEFINED OPENSSL_DIR)
include(${OPENSSL_DIR}/openssl.cmake)
set(OpenSSL_ADDED ON)
# Overrides find package
CPMAddPackage(
@ -561,7 +568,6 @@ if (YUZU_USE_CPM)
)
else()
find_package(OpenSSL 1.1.1 REQUIRED)
set(OpenSSL_ADDED OFF)
endif()
endif()

3
src/core/CMakeLists.txt
View file

@ -1249,10 +1249,11 @@ if(ENABLE_OPENSSL)
target_sources(core PRIVATE
hle/service/ssl/ssl_backend_openssl.cpp)
find_package(OpenSSL REQUIRED)
if (OpenSSL_ADDED)
link_openssl(core)
else()
find_package(OpenSSL REQUIRED)
target_link_libraries(core PRIVATE OpenSSL::SSL)
endif()
elseif (APPLE)

2
src/dynarmic/src/dynarmic/frontend/A32/a32_types.h
View file

@ -105,7 +105,7 @@ inline size_t RegNumber(ExtReg reg) {
return static_cast<size_t>(reg) - static_cast<size_t>(ExtReg::Q0);
}
ASSERT_FALSE("Invalid extended register");
ASSERT_MSG(false, "Invalid extended register");
}
inline Reg operator+(Reg reg, size_t number) {