From b5ac7ddcf3bf4136854e6e4061a6243654d6d2a9 Mon Sep 17 00:00:00 2001 From: psy_inf Date: Mon, 20 Jan 2025 10:40:16 +0100 Subject: [PATCH] Using updated miniz-cpp with static function signature fixes --- .gitmodules | 3 ++- include/vfspp/ZipFile.hpp | 2 +- include/vfspp/ZipFileSystem.hpp | 6 +++++- vendor/miniz-cpp | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 18a973f..7d0f9bb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "vendor/miniz-cpp"] path = vendor/miniz-cpp - url = https://github.com/tfussell/miniz-cpp.git + url = https://github.com/psyinf/miniz-cpp.git + diff --git a/include/vfspp/ZipFile.hpp b/include/vfspp/ZipFile.hpp index 0cfc696..d1623f0 100644 --- a/include/vfspp/ZipFile.hpp +++ b/include/vfspp/ZipFile.hpp @@ -2,7 +2,7 @@ #define ZIPFILE_HPP #include "IFile.h" -#include "zip_file.hpp" +#include "miniz_cpp.hpp" namespace vfspp { diff --git a/include/vfspp/ZipFileSystem.hpp b/include/vfspp/ZipFileSystem.hpp index f774a24..d26204e 100644 --- a/include/vfspp/ZipFileSystem.hpp +++ b/include/vfspp/ZipFileSystem.hpp @@ -5,8 +5,12 @@ #include "Global.h" #include "StringUtils.hpp" #include "ZipFile.hpp" -#include "zip_file.hpp" +#include "miniz_cpp.hpp" +#ifdef _WIN32 +#undef CreateFile +#undef CopyFile +#endif namespace fs = std::filesystem; namespace vfspp diff --git a/vendor/miniz-cpp b/vendor/miniz-cpp index 052335e..a3f5691 160000 --- a/vendor/miniz-cpp +++ b/vendor/miniz-cpp @@ -1 +1 @@ -Subproject commit 052335e4f7773368df07b26d2baedb0e6d4dbd38 +Subproject commit a3f5691a2da267763540337ac7554ddfa37d7c7e