piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity
1a2b6ca2d6
dolphin/Externals/minizip
History
nyanpasu64 1a2b6ca2d6 Fix Windows CMake builds with shared zlib 
On Linux, if shared zlib is present, zlib.h is always available and -lz
links to zlib, even if you don't run find_package(ZLIB).

For some reason I have zlib installed on Windows (possibly from vcpkg),
so find_package(ZLIB) succeeds and ZLIB_FOUND is true.
When Dolphin uses shared zlib on Windows, the problem is that zlib.h
is not in the default include path, and the CMake target is called
ZLIB::ZLIB and there's neither a target nor a library called z.

However, both find_package(ZLIB) and add_subdirectory(Externals/zlib)
create a target called ZLIB::ZLIB, so I'll switch to that instead.
Hopefully this change doesn't break anyone's build.
2020-07-15 23:25:18 -07:00
..
CMakeLists.txt Fix Windows CMake builds with shared zlib 2020-07-15 23:25:18 -07:00
ioapi.c Externals: Add a stripped down version of minizip. 2018-10-09 14:27:53 +02:00
ioapi.h Externals: Add a stripped down version of minizip. 2018-10-09 14:27:53 +02:00
LICENSE Externals: Add a stripped down version of minizip. 2018-10-09 14:27:53 +02:00
minizip.vcxproj Add an ARM64 target to Visual Studio projects 2019-12-28 19:20:41 +10:00
README Externals: Add a stripped down version of minizip. 2018-10-09 14:27:53 +02:00
unzip.c Externals: Add a stripped down version of minizip. 2018-10-09 14:27:53 +02:00
unzip.h Externals: Add a stripped down version of minizip. 2018-10-09 14:27:53 +02:00

README 

Partial import from https://github.com/nmoinvaz/minizip
Revision: b3713abe7722f1b779e7cdbd527c6208abbe1121