From 185db5c0509d7c5fee5ef6585aea27943b3f489f Mon Sep 17 00:00:00 2001 From: inspectredc Date: Sat, 23 Sep 2023 23:31:37 +0100 Subject: [PATCH 1/3] fix building windows --- src/Companion.cpp | 6 ++++-- src/audio/AudioManager.cpp | 1 + src/factories/BlobFactory.cpp | 1 + src/factories/debug/MIO0Factory.cpp | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Companion.cpp b/src/Companion.cpp index fa557fa..414b9c0 100644 --- a/src/Companion.cpp +++ b/src/Companion.cpp @@ -18,6 +18,8 @@ #include #include +using string_type = _STD wstring; + namespace fs = std::filesystem; void Companion::Init() { @@ -70,7 +72,7 @@ void Companion::Process() { for (const auto & entry : fs::directory_iterator(path)){ std::cout << "Processing " << entry.path() << '\n'; - YAML::Node root = YAML::LoadFile(entry.path()); + YAML::Node root = YAML::LoadFile(entry.path().string()); for(auto asset = root.begin(); asset != root.end(); ++asset){ auto type = asset->second["type"].as(); @@ -84,7 +86,7 @@ void Companion::Process() { auto buffer = write.ToVector(); auto output = entry.path().stem() / asset->first.as(); - wrapper.CreateFile(output, buffer); + wrapper.CreateFile(output.string(), buffer); if(type != "TEXTURE") { std::string dpath = "debug/" + output.string(); diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp index c1475a7..0bbc3c0 100644 --- a/src/audio/AudioManager.cpp +++ b/src/audio/AudioManager.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include "hj/pyutils.h" #include "binarytools/BinaryReader.h" #include "hj/zip.h" diff --git a/src/factories/BlobFactory.cpp b/src/factories/BlobFactory.cpp index e020079..e4924bf 100644 --- a/src/factories/BlobFactory.cpp +++ b/src/factories/BlobFactory.cpp @@ -1,4 +1,5 @@ #include "BlobFactory.h" +#include #include "utils/MIODecoder.h" namespace fs = std::filesystem; diff --git a/src/factories/debug/MIO0Factory.cpp b/src/factories/debug/MIO0Factory.cpp index dd73f12..7ebf2a2 100644 --- a/src/factories/debug/MIO0Factory.cpp +++ b/src/factories/debug/MIO0Factory.cpp @@ -1,4 +1,5 @@ #include "MIO0Factory.h" +#include #include "utils/MIODecoder.h" namespace fs = std::filesystem; From 3b9fe53e8ccdf307744651166c1610af4a2543e4 Mon Sep 17 00:00:00 2001 From: inspectredc Date: Sat, 23 Sep 2023 23:34:33 +0100 Subject: [PATCH 2/3] oops remove random line --- src/Companion.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Companion.cpp b/src/Companion.cpp index 414b9c0..5d7607a 100644 --- a/src/Companion.cpp +++ b/src/Companion.cpp @@ -18,8 +18,6 @@ #include #include -using string_type = _STD wstring; - namespace fs = std::filesystem; void Companion::Init() { From 8ad502affcf89eb07929d167cdb8a9b0bc1e0b4d Mon Sep 17 00:00:00 2001 From: inspectredc Date: Sat, 23 Sep 2023 23:56:01 +0100 Subject: [PATCH 3/3] build linux --- src/audio/AudioManager.cpp | 1 + src/factories/BlobFactory.cpp | 2 +- src/factories/RawFactory.h | 1 + src/factories/debug/MIO0Factory.cpp | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp index 0bbc3c0..739800c 100644 --- a/src/audio/AudioManager.cpp +++ b/src/audio/AudioManager.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include "hj/pyutils.h" #include "binarytools/BinaryReader.h" #include "hj/zip.h" diff --git a/src/factories/BlobFactory.cpp b/src/factories/BlobFactory.cpp index e4924bf..cc66463 100644 --- a/src/factories/BlobFactory.cpp +++ b/src/factories/BlobFactory.cpp @@ -1,5 +1,5 @@ #include "BlobFactory.h" -#include +#include #include "utils/MIODecoder.h" namespace fs = std::filesystem; diff --git a/src/factories/RawFactory.h b/src/factories/RawFactory.h index 5019ad6..9a23d71 100644 --- a/src/factories/RawFactory.h +++ b/src/factories/RawFactory.h @@ -3,6 +3,7 @@ #include "ResourceType.h" #include #include +#include #include #include diff --git a/src/factories/debug/MIO0Factory.cpp b/src/factories/debug/MIO0Factory.cpp index 7ebf2a2..e5858ed 100644 --- a/src/factories/debug/MIO0Factory.cpp +++ b/src/factories/debug/MIO0Factory.cpp @@ -1,5 +1,5 @@ #include "MIO0Factory.h" -#include +#include #include "utils/MIODecoder.h" namespace fs = std::filesystem;