Merge pull request #10704 from Tilka/minizip

CMake: rename minizip to minizip-ng
dolphin-emu · Jun 6, 2022 · 86fc13f · 86fc13f
2 parents 664663e + 79a7bf0
commit 86fc13f
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -753,7 +753,7 @@ else()
   add_subdirectory(Externals/zlib)
 endif()
 
-pkg_check_modules(MINIZIP minizip>=2.0.0)
+pkg_check_modules(MINIZIP minizip-ng>=3.0.0)
 if(MINIZIP_FOUND)
   message(STATUS "Using shared minizip")
   include_directories(${MINIZIP_INCLUDE_DIRS})

diff --git a/Externals/minizip/CMakeLists.txt b/Externals/minizip/CMakeLists.txt
@@ -67,4 +67,4 @@ endif()
 
 target_link_libraries(minizip PUBLIC ZLIB::ZLIB)
 
-add_library(MiniZip::minizip ALIAS minizip)
+add_library(minizip-ng ALIAS minizip)
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -5,7 +5,7 @@
 
 #include <algorithm>
 
-#include <unzip.h>
+#include <mz_compat.h>
 
 #include "Common/CommonPaths.h"
 #include "Common/FileSearch.h"