mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-09 07:39:26 +01:00
Merge pull request #8846 from nyanpasu64/fix-cmake-zlib
Fix Windows CMake builds with shared zlib
This commit is contained in:
commit
08f9ed043b
2
Externals/libpng/CMakeLists.txt
vendored
2
Externals/libpng/CMakeLists.txt
vendored
@ -23,7 +23,7 @@ PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
)
|
||||
|
||||
target_link_libraries(png PUBLIC z)
|
||||
target_link_libraries(png PUBLIC ZLIB::ZLIB)
|
||||
|
||||
if(NOT MSVC)
|
||||
target_compile_options(png
|
||||
|
2
Externals/minizip/CMakeLists.txt
vendored
2
Externals/minizip/CMakeLists.txt
vendored
@ -13,6 +13,6 @@ endif()
|
||||
add_library(minizip STATIC ${SRCS})
|
||||
target_include_directories(minizip PUBLIC .)
|
||||
|
||||
target_link_libraries(minizip PUBLIC z)
|
||||
target_link_libraries(minizip PUBLIC ZLIB::ZLIB)
|
||||
|
||||
add_library(MiniZip::minizip ALIAS minizip)
|
||||
|
@ -7,7 +7,7 @@ add_library(updatercommon
|
||||
target_link_libraries(updatercommon PRIVATE
|
||||
uicommon
|
||||
mbedtls
|
||||
z
|
||||
ZLIB::ZLIB
|
||||
ed25519
|
||||
cpp-optparse
|
||||
)
|
Loading…
x
Reference in New Issue
Block a user