piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-27 17:39:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix build with minizip-ng 4.0.8

Browse Source
This commit is contained in:
Joshua Vandaële
2025-01-11 12:19:37 +01:00
parent 3ea870ef8c
commit fa442dc90b
6 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Externals/minizip-ng/CMakeLists.txt vendored
View File

@ -2,8 +2,13 @@ project(minizip C)
add_library(minizip STATIC
minizip-ng/mz.h
minizip-ng/mz_compat.c
minizip-ng/mz_compat.h
# minizip-ng/compat/crypt.h
minizip-ng/compat/ioapi.c
minizip-ng/compat/ioapi.h
minizip-ng/compat/unzip.c
minizip-ng/compat/unzip.h
# minizip-ng/compat/zip.c
# minizip-ng/compat/zip.h
minizip-ng/mz_crypt.c
minizip-ng/mz_crypt.h
minizip-ng/mz_os.c
@ -60,7 +65,7 @@ endif()
# minizip-ng/mz_crypt_winvista.c
# minizip-ng/mz_crypt_winxp.c
target_include_directories(minizip PUBLIC minizip-ng)
target_include_directories(minizip PUBLIC minizip-ng minizip-ng/compat)
target_compile_definitions(minizip PRIVATE HAVE_ZLIB ZLIB_COMPAT MZ_ZIP_NO_CRYPTO MZ_ZIP_NO_ENCRYPTION)
if (UNIX)

2
Externals/minizip-ng/minizip-ng vendored

Submodule Externals/minizip-ng/minizip-ng updated: 3eed562ef0...55db144e03

8
Externals/minizip-ng/minizip-ng.vcxproj vendored
View File

@ -17,11 +17,14 @@
<PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup>
<ClCompile>
<!-- Ensure minizip-ng sees mz.h -->
<AdditionalIncludeDirectories>minizip-ng;minizip-ng\compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>HAVE_ZLIB;ZLIB_COMPAT;MZ_ZIP_NO_CRYPTO;MZ_ZIP_NO_ENCRYPTION;HAVE_STDINT_H;HAVE_INTTYPES_H;NO_FSEEKO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="minizip-ng\mz_compat.c" />
<ClCompile Include="minizip-ng\compat\ioapi.c" />
<ClCompile Include="minizip-ng\compat\unzip.c" />
<ClCompile Include="minizip-ng\mz_crypt.c" />
<ClCompile Include="minizip-ng\mz_os.c" />
<ClCompile Include="minizip-ng\mz_os_win32.c" />
@ -36,7 +39,8 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="minizip-ng\mz.h" />
<ClInclude Include="minizip-ng\mz_compat.h" />
<ClCompile Include="minizip-ng\compat\ioapi.h" />
<ClCompile Include="minizip-ng\compat\unzip.h" />
<ClInclude Include="minizip-ng\mz_crypt.h" />
<ClInclude Include="minizip-ng\mz_os.h" />
<ClInclude Include="minizip-ng\mz_strm.h" />