summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLywx <kiritodev01@gmail.com>2023-09-23 19:42:58 -0600
committerGitHub <noreply@github.com>2023-09-23 19:42:58 -0600
commit5d07dcb92553deff0dc8de0ff7c5822af131f245 (patch)
tree6b5369ed119d231e76c3a8cc3f5e9c23f7c29443
parent42314c93dda42af1daee702a8adce12abccecc9e (diff)
parent8ad502affcf89eb07929d167cdb8a9b0bc1e0b4d (diff)
Merge pull request #2 from inspectredc/build-fix-proper
Fix Linux and Windows Build Errors
-rw-r--r--src/Companion.cpp4
-rw-r--r--src/audio/AudioManager.cpp2
-rw-r--r--src/factories/BlobFactory.cpp1
-rw-r--r--src/factories/RawFactory.h1
-rw-r--r--src/factories/debug/MIO0Factory.cpp1
5 files changed, 7 insertions, 2 deletions
diff --git a/src/Companion.cpp b/src/Companion.cpp
index fa557fa..5d7607a 100644
--- a/src/Companion.cpp
+++ b/src/Companion.cpp
@@ -70,7 +70,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<std::string>();
@@ -84,7 +84,7 @@ void Companion::Process() {
auto buffer = write.ToVector();
auto output = entry.path().stem() / asset->first.as<std::string>();
- 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..739800c 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -5,6 +5,8 @@
#include <fstream>
#include <iostream>
#include <filesystem>
+#include <cassert>
+#include <cstring>
#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..cc66463 100644
--- a/src/factories/BlobFactory.cpp
+++ b/src/factories/BlobFactory.cpp
@@ -1,4 +1,5 @@
#include "BlobFactory.h"
+#include <cstring>
#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 <string>
#include <vector>
+#include <filesystem>
#include <binarytools/BinaryWriter.h>
#include <yaml-cpp/yaml.h>
diff --git a/src/factories/debug/MIO0Factory.cpp b/src/factories/debug/MIO0Factory.cpp
index dd73f12..e5858ed 100644
--- a/src/factories/debug/MIO0Factory.cpp
+++ b/src/factories/debug/MIO0Factory.cpp
@@ -1,4 +1,5 @@
#include "MIO0Factory.h"
+#include <cstring>
#include "utils/MIODecoder.h"
namespace fs = std::filesystem;