preserve-emulation/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-09-11 15:13:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

cmake: fix Windows/MSVC build issues with zlib path and wolfSSL TLS1.3

Browse Source
This commit is contained in:
Alasonga
2026-08-03 09:24:56 +02:00
committed by Megamouse
parent 59e59c7de6
commit f61c0cb5df
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
3rdparty/wolfssl/CMakeLists.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ if(USE_SYSTEM_WOLFSSL)
add_library(wolfssl INTERFACE)
target_link_libraries(wolfssl INTERFACE PkgConfig::WolfSSL)
else()
set(WOLFSSL_TLS13 OFF CACHE INTERNAL "")
set(WOLFSSL_TLS13 ON CACHE INTERNAL "" FORCE)
set(WOLFSSL_SHA3 ON CACHE INTERNAL "")
set(WOLFSSL_SHAKE256 ON CACHE INTERNAL "")
set(WOLFSSL_BASE64_ENCODE OFF CACHE INTERNAL "")
buildfiles/cmake/FindZLIB.cmake
+17 -4
View File
@@ -3,9 +3,22 @@ if(USE_SYSTEM_ZLIB)
find_package(ZLIB)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
else()
add_library(ZLIB::ZLIB STATIC IMPORTED)
set_target_properties(ZLIB::ZLIB PROPERTIES
IMPORTED_LOCATION "${CMAKE_BINARY_DIR}/3rdparty/zlib/zlib/libzlibstatic.a"
INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/3rdparty/zlib/zlib;${CMAKE_BINARY_DIR}/3rdparty/zlib/zlib")
if(NOT TARGET ZLIB::ZLIB)
add_library(ZLIB::ZLIB STATIC IMPORTED GLOBAL)
if(MSVC)
# On MSVC, zlib builds as zs.lib (Release) / zsd.lib (Debug) in per-config subdirectories
set_target_properties(ZLIB::ZLIB PROPERTIES
IMPORTED_LOCATION_RELEASE "${CMAKE_BINARY_DIR}/3rdparty/zlib/zlib/Release/zs.lib"
IMPORTED_LOCATION_DEBUG "${CMAKE_BINARY_DIR}/3rdparty/zlib/zlib/Debug/zsd.lib"
IMPORTED_LOCATION_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/3rdparty/zlib/zlib/RelWithDebInfo/zs.lib"
IMPORTED_LOCATION_MINSIZEREL "${CMAKE_BINARY_DIR}/3rdparty/zlib/zlib/MinSizeRel/zs.lib")
else()
# On non-MSVC, zlib OUTPUT_NAME is "z" → libz.a
set_target_properties(ZLIB::ZLIB PROPERTIES
IMPORTED_LOCATION "${CMAKE_BINARY_DIR}/3rdparty/zlib/zlib/libz.a")
endif()
set_target_properties(ZLIB::ZLIB PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/3rdparty/zlib/zlib;${CMAKE_BINARY_DIR}/3rdparty/zlib/zlib")
endif()
set(ZLIB_FOUND TRUE)
endif()