|
Mystro256 |
67d34b1 |
From 35970592dd105d08148167384d20660e7d449fd8 Mon Sep 17 00:00:00 2001
|
|
Mystro256 |
fe5abf9 |
From: Mystro256 <alexjnewt@hotmail.com>
|
|
Mystro256 |
fe5abf9 |
Date: Tue, 5 May 2020 16:50:14 -0400
|
|
Mystro256 |
fe5abf9 |
Subject: [PATCH 5/5] Revert "Externals: Update minizip search path."
|
|
Mystro256 |
fe5abf9 |
|
|
Mystro256 |
fe5abf9 |
This reverts commit f8f592c34536d58febb8dc485927ac48c3f165a3.
|
|
Mystro256 |
fe5abf9 |
---
|
|
Mystro256 |
fe5abf9 |
Source/Core/Common/MinizipUtil.h | 2 +-
|
|
Mystro256 |
fe5abf9 |
Source/Core/DiscIO/VolumeVerifier.cpp | 2 +-
|
|
Mystro256 |
fe5abf9 |
Source/Core/UICommon/ResourcePack/ResourcePack.cpp | 2 +-
|
|
Mystro256 |
fe5abf9 |
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
Mystro256 |
fe5abf9 |
|
|
Mystro256 |
fe5abf9 |
diff --git a/Source/Core/Common/MinizipUtil.h b/Source/Core/Common/MinizipUtil.h
|
|
Mystro256 |
fe5abf9 |
index 13589dd1b3..8d8bc7d692 100644
|
|
Mystro256 |
fe5abf9 |
--- a/Source/Core/Common/MinizipUtil.h
|
|
Mystro256 |
fe5abf9 |
+++ b/Source/Core/Common/MinizipUtil.h
|
|
Mystro256 |
fe5abf9 |
@@ -6,7 +6,7 @@
|
|
Mystro256 |
fe5abf9 |
|
|
Mystro256 |
fe5abf9 |
#include <algorithm>
|
|
Mystro256 |
fe5abf9 |
|
|
Mystro256 |
fe5abf9 |
-#include <unzip.h>
|
|
Mystro256 |
fe5abf9 |
+#include <minizip/unzip.h>
|
|
Mystro256 |
fe5abf9 |
|
|
Mystro256 |
fe5abf9 |
#include "Common/CommonTypes.h"
|
|
Mystro256 |
fe5abf9 |
#include "Common/ScopeGuard.h"
|
|
Mystro256 |
fe5abf9 |
diff --git a/Source/Core/DiscIO/VolumeVerifier.cpp b/Source/Core/DiscIO/VolumeVerifier.cpp
|
|
Mystro256 |
67d34b1 |
index 04b285cbc4..ecc001075e 100644
|
|
Mystro256 |
fe5abf9 |
--- a/Source/Core/DiscIO/VolumeVerifier.cpp
|
|
Mystro256 |
fe5abf9 |
+++ b/Source/Core/DiscIO/VolumeVerifier.cpp
|
|
Mystro256 |
fe5abf9 |
@@ -18,8 +18,8 @@
|
|
Mystro256 |
fe5abf9 |
|
|
Mystro256 |
fe5abf9 |
#include <mbedtls/md5.h>
|
|
Mystro256 |
fe5abf9 |
#include <mbedtls/sha1.h>
|
|
Mystro256 |
fe5abf9 |
+#include <minizip/unzip.h>
|
|
Mystro256 |
fe5abf9 |
#include <pugixml.hpp>
|
|
Mystro256 |
fe5abf9 |
-#include <unzip.h>
|
|
Mystro256 |
fe5abf9 |
#include <zlib.h>
|
|
Mystro256 |
fe5abf9 |
|
|
Mystro256 |
fe5abf9 |
#include "Common/Align.h"
|
|
Mystro256 |
fe5abf9 |
diff --git a/Source/Core/UICommon/ResourcePack/ResourcePack.cpp b/Source/Core/UICommon/ResourcePack/ResourcePack.cpp
|
|
Mystro256 |
fe5abf9 |
index 75f178a840..f03a7d58a0 100644
|
|
Mystro256 |
fe5abf9 |
--- a/Source/Core/UICommon/ResourcePack/ResourcePack.cpp
|
|
Mystro256 |
fe5abf9 |
+++ b/Source/Core/UICommon/ResourcePack/ResourcePack.cpp
|
|
Mystro256 |
fe5abf9 |
@@ -6,7 +6,7 @@
|
|
Mystro256 |
fe5abf9 |
|
|
Mystro256 |
fe5abf9 |
#include <algorithm>
|
|
Mystro256 |
fe5abf9 |
|
|
Mystro256 |
fe5abf9 |
-#include <unzip.h>
|
|
Mystro256 |
fe5abf9 |
+#include <minizip/unzip.h>
|
|
Mystro256 |
fe5abf9 |
|
|
Mystro256 |
fe5abf9 |
#include "Common/CommonPaths.h"
|
|
Mystro256 |
fe5abf9 |
#include "Common/FileSearch.h"
|
|
Mystro256 |
fe5abf9 |
--
|
|
Mystro256 |
fe5abf9 |
2.26.2
|
|
Mystro256 |
fe5abf9 |
|