diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2022-06-06 20:37:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-06 20:37:19 +0200 |
| commit | 86fc13ff8675afdb07494a1128913eb6c8715072 (patch) | |
| tree | 36c043a854956243628d7b5a78151425a5fc1386 /Source/Core | |
| parent | 664663e8de7944585b2c936a283c70466917d861 (diff) | |
| parent | 79a7bf02eb934dcf924d9f5cde55ba17d41643bf (diff) | |
Merge pull request #10704 from Tilka/minizip
CMake: rename minizip to minizip-ng
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Common/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Source/Core/Common/MinizipUtil.h | 2 | ||||
| -rw-r--r-- | Source/Core/DiscIO/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Source/Core/DiscIO/VolumeVerifier.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/UICommon/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Source/Core/UICommon/ResourcePack/ResourcePack.cpp | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt index 52448c9ea9..729d62c441 100644 --- a/Source/Core/Common/CMakeLists.txt +++ b/Source/Core/Common/CMakeLists.txt @@ -140,7 +140,7 @@ PUBLIC enet fmt::fmt ${MBEDTLS_LIBRARIES} - minizip + minizip-ng PRIVATE ${CURL_LIBRARIES} diff --git a/Source/Core/Common/MinizipUtil.h b/Source/Core/Common/MinizipUtil.h index d06b3f4f5d..6057632ddd 100644 --- a/Source/Core/Common/MinizipUtil.h +++ b/Source/Core/Common/MinizipUtil.h @@ -5,7 +5,7 @@ #include <algorithm>
-#include <unzip.h>
+#include <mz_compat.h>
#include "Common/CommonTypes.h"
#include "Common/ScopeGuard.h"
diff --git a/Source/Core/DiscIO/CMakeLists.txt b/Source/Core/DiscIO/CMakeLists.txt index 68028dbcfc..ec1562325a 100644 --- a/Source/Core/DiscIO/CMakeLists.txt +++ b/Source/Core/DiscIO/CMakeLists.txt @@ -73,7 +73,7 @@ PUBLIC PRIVATE fmt::fmt - minizip + minizip-ng pugixml ZLIB::ZLIB ) diff --git a/Source/Core/DiscIO/VolumeVerifier.cpp b/Source/Core/DiscIO/VolumeVerifier.cpp index 05070e3878..84ab51ef13 100644 --- a/Source/Core/DiscIO/VolumeVerifier.cpp +++ b/Source/Core/DiscIO/VolumeVerifier.cpp @@ -14,8 +14,8 @@ #include <mbedtls/md5.h> #include <mbedtls/sha1.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/CMakeLists.txt b/Source/Core/UICommon/CMakeLists.txt index 2b7d5bd2a6..f2ffbd0821 100644 --- a/Source/Core/UICommon/CMakeLists.txt +++ b/Source/Core/UICommon/CMakeLists.txt @@ -31,7 +31,7 @@ target_link_libraries(uicommon PUBLIC common cpp-optparse - minizip + minizip-ng pugixml PRIVATE diff --git a/Source/Core/UICommon/ResourcePack/ResourcePack.cpp b/Source/Core/UICommon/ResourcePack/ResourcePack.cpp index 98f0cd2e2d..585559029d 100644 --- a/Source/Core/UICommon/ResourcePack/ResourcePack.cpp +++ b/Source/Core/UICommon/ResourcePack/ResourcePack.cpp @@ -5,7 +5,7 @@ #include <algorithm> -#include <unzip.h> +#include <mz_compat.h> #include "Common/CommonPaths.h" #include "Common/FileSearch.h" |