summaryrefslogtreecommitdiff
path: root/tools/knarc/Narc.h
diff options
context:
space:
mode:
authorkr3nshaw <20672068+kr3nshaw@users.noreply.github.com>2020-07-04 13:36:48 +1000
committerkr3nshaw <20672068+kr3nshaw@users.noreply.github.com>2020-07-04 13:36:48 +1000
commitde0dc52609cbac5810b682d1c95b5900483ab67b (patch)
tree79c9cc72df16e7f9d18a3690395ce310af814dfd /tools/knarc/Narc.h
parent6354fb0aa4f80e84b0c6c05e91c2a85b85911f69 (diff)
Added fnmatch for Windows
Diffstat (limited to 'tools/knarc/Narc.h')
-rw-r--r--tools/knarc/Narc.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/tools/knarc/Narc.h b/tools/knarc/Narc.h
index 4516d2d5..ba97cbc9 100644
--- a/tools/knarc/Narc.h
+++ b/tools/knarc/Narc.h
@@ -5,7 +5,7 @@
#include <string>
#include <vector>
-#if __GNUC__ <= 7
+#if (__GNUC__ <= 7) && !defined _MSC_VER
#include <experimental/filesystem>
namespace fs = std::experimental::filesystem;
#else
@@ -75,19 +75,19 @@ struct FileImages
class Narc
{
- public:
- NarcError GetError() const;
+public:
+ NarcError GetError() const;
- bool Pack(const fs::path& fileName, const fs::path& directory);
- bool Unpack(const fs::path& fileName, const fs::path& directory);
+ bool Pack(const fs::path& fileName, const fs::path& directory);
+ bool Unpack(const fs::path& fileName, const fs::path& directory);
- private:
- NarcError error = NarcError::None;
+private:
+ NarcError error = NarcError::None;
- void AlignDword(std::ofstream& ofs, uint8_t paddingChar);
+ void AlignDword(std::ofstream& ofs, uint8_t paddingChar);
- bool Cleanup(std::ifstream& ifs, const NarcError& e);
- bool Cleanup(std::ofstream& ofs, const NarcError& e);
+ bool Cleanup(std::ifstream& ifs, const NarcError& e);
+ bool Cleanup(std::ofstream& ofs, const NarcError& e);
- std::vector<fs::directory_entry> OrderedDirectoryIterator(const fs::path& path, bool recursive) const;
+ std::vector<fs::directory_entry> OrderedDirectoryIterator(const fs::path& path, bool recursive) const;
};