ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8846 from nyanpasu64/fix-cmake-zlib 

Fix Windows CMake builds with shared zlib
This commit is contained in:
Léo Lam 2020-10-22 01:11:27 +02:00 committed by GitHub
parent 96ce3e5f49 1a2b6ca2d6
commit 08f9ed043b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Externals/libpng/CMakeLists.txt vendored
View File

@ -23,7 +23,7 @@ PUBLIC
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
target_link_libraries(png PUBLIC z) target_link_libraries(png PUBLIC ZLIB::ZLIB)
if(NOT MSVC) if(NOT MSVC)
target_compile_options(png target_compile_options(png

2
Externals/minizip/CMakeLists.txt vendored
View File

@ -13,6 +13,6 @@ endif()
add_library(minizip STATIC ${SRCS}) add_library(minizip STATIC ${SRCS})
target_include_directories(minizip PUBLIC .) target_include_directories(minizip PUBLIC .)
target_link_libraries(minizip PUBLIC z) target_link_libraries(minizip PUBLIC ZLIB::ZLIB)
add_library(MiniZip::minizip ALIAS minizip) add_library(MiniZip::minizip ALIAS minizip)

2
Source/Core/UpdaterCommon/CMakeLists.txt
View File

@ -7,7 +7,7 @@ add_library(updatercommon
target_link_libraries(updatercommon PRIVATE target_link_libraries(updatercommon PRIVATE
uicommon uicommon
mbedtls mbedtls
z ZLIB::ZLIB
ed25519 ed25519
cpp-optparse cpp-optparse
) )