piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-22 22:00:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12736 from mitaclaw/minizip-ng-update

Browse Source 
Externals: Update minizip-ng to 4.0.5 and convert to submodule
This commit is contained in:
Admiral H. Curtiss
2024-05-21 22:21:56 +02:00
committed by GitHub
parent 5c2f73986a cd25e91ca2
commit 35ee08ba9f
60 changed files with 126 additions and 18370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinLib.vcxproj
View File

@ -50,7 +50,7 @@
<Import Project="$(ExternalsDir)mbedtls\exports.props" />
<Import Project="$(ExternalsDir)mGBA\exports.props" />
<Import Project="$(ExternalsDir)miniupnpc\exports.props" />
<Import Project="$(ExternalsDir)minizip\exports.props" />
<Import Project="$(ExternalsDir)minizip-ng\exports.props" />
<Import Project="$(ExternalsDir)picojson\exports.props" />
<Import Project="$(ExternalsDir)pugixml\exports.props" />
<Import Project="$(ExternalsDir)rcheevos\exports.props" />

4
Source/Core/UICommon/ResourcePack/ResourcePack.cpp
View File

@ -36,7 +36,7 @@ ResourcePack::ResourcePack(const std::string& path) : m_path(path)
return;
}
if (unzLocateFile(file, "manifest.json", nullptr) == UNZ_END_OF_LIST_OF_FILE)
if (unzLocateFile(file, "manifest.json", 0) == UNZ_END_OF_LIST_OF_FILE)
{
m_valid = false;
m_error = "Resource pack is missing a manifest.";
@ -63,7 +63,7 @@ ResourcePack::ResourcePack(const std::string& path) : m_path(path)
return;
}
if (unzLocateFile(file, "logo.png", nullptr) != UNZ_END_OF_LIST_OF_FILE)
if (unzLocateFile(file, "logo.png", 0) != UNZ_END_OF_LIST_OF_FILE)
{
unz_file_info64 logo_info{};
unzGetCurrentFileInfo64(file, &logo_info, nullptr, 0, nullptr, 0, nullptr, 0);