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 b/Externals/minizip-ng/minizip-ng index 3eed562ef0ea..55db144e0302 160000 --- a/Externals/minizip-ng/minizip-ng +++ b/Externals/minizip-ng/minizip-ng @@ -1 +1 @@ -Subproject commit 3eed562ef0ea3516db30d1c8ecb0e1b486d8cb70 +Subproject commit 55db144e03027b43263e5ebcb599bf0878ba58de 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 @@ + + minizip-ng;minizip-ng\compat;%(AdditionalIncludeDirectories) HAVE_ZLIB;ZLIB_COMPAT;MZ_ZIP_NO_CRYPTO;MZ_ZIP_NO_ENCRYPTION;HAVE_STDINT_H;HAVE_INTTYPES_H;NO_FSEEKO;%(PreprocessorDefinitions) - + + @@ -36,7 +39,8 @@ - + + 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 -#include +#include #include "Common/CommonTypes.h" #include "Common/ScopeGuard.h" diff --git a/Source/Core/DiscIO/VolumeVerifier.cpp b/Source/Core/DiscIO/VolumeVerifier.cpp index a4725cbbe25c..19b29c4d590a 100644 --- a/Source/Core/DiscIO/VolumeVerifier.cpp +++ b/Source/Core/DiscIO/VolumeVerifier.cpp @@ -12,8 +12,8 @@ #include #include +#include #include -#include #include #include "Common/Align.h" diff --git a/Source/Core/UICommon/ResourcePack/ResourcePack.cpp b/Source/Core/UICommon/ResourcePack/ResourcePack.cpp index 117c3cc31cfb..6937e8eba64c 100644 --- a/Source/Core/UICommon/ResourcePack/ResourcePack.cpp +++ b/Source/Core/UICommon/ResourcePack/ResourcePack.cpp @@ -6,7 +6,9 @@ #include #include -#include +#include +#include + #include #include "Common/CommonPaths.h"