1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 819ea0440905..3c47f4ff3a04 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -675,7 +675,7 @@ dolphin_find_optional_system_library_pkgconfig(ZSTD libzstd>=1.4.0 zstd::zstd Ex
add_subdirectory(Externals/zlib-ng)
dolphin_find_optional_system_library_pkgconfig(MINIZIP
- "minizip>=4.0.4" minizip::minizip Externals/minizip-ng
+ "minizip>=4.0.8" minizip::minizip Externals/minizip-ng
)
dolphin_find_optional_system_library(LZO Externals/LZO)
diff --git a/Externals/minizip-ng/CMakeLists.txt b/Externals/minizip-ng/CMakeLists.txt
index 3a2e7e6b670b..5929cef96d51 100644
--- a/Externals/minizip-ng/CMakeLists.txt
+++ b/Externals/minizip-ng/CMakeLists.txt
@@ -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)
diff --git a/Externals/minizip-ng/minizip-ng.vcxproj b/Externals/minizip-ng/minizip-ng.vcxproj
index 98cdef83c005..4b6e7542fa44 100644
--- a/Externals/minizip-ng/minizip-ng.vcxproj
+++ b/Externals/minizip-ng/minizip-ng.vcxproj
@@ -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" />
diff --git a/Source/Core/Common/MinizipUtil.h b/Source/Core/Common/MinizipUtil.h
index 29b365c02871..af9f71d724cb 100644
--- a/Source/Core/Common/MinizipUtil.h
+++ b/Source/Core/Common/MinizipUtil.h
@@ -5,7 +5,7 @@
#include <algorithm>
-#include <mz_compat.h>
+#include <unzip.h>
#include "Common/CommonTypes.h"
#include "Common/ScopeGuard.h"
diff --git a/Source/Core/DiscIO/VolumeVerifier.cpp b/Source/Core/DiscIO/VolumeVerifier.cpp
index a4725cbbe25c..18ef37102e6e 100644
--- a/Source/Core/DiscIO/VolumeVerifier.cpp
+++ b/Source/Core/DiscIO/VolumeVerifier.cpp
@@ -13,8 +13,8 @@
#include <unordered_set>
#include <mbedtls/md5.h>
-#include <mz_compat.h>
#include <pugixml.hpp>
+#include <unzip.h>
#include "Common/Align.h"
#include "Common/Assert.h"
diff --git a/Source/Core/UICommon/ResourcePack/ResourcePack.cpp b/Source/Core/UICommon/ResourcePack/ResourcePack.cpp
index 117c3cc31cfb..dbbedaf5bbdf 100644
--- a/Source/Core/UICommon/ResourcePack/ResourcePack.cpp
+++ b/Source/Core/UICommon/ResourcePack/ResourcePack.cpp
@@ -6,7 +6,9 @@
#include <algorithm>
#include <memory>
-#include <mz_compat.h>
+#include <mz.h>
+#include <unzip.h>
+
#include <mz_os.h>
#include "Common/CommonPaths.h"
|