summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKiritoDv <kiritodev01@gmail.com>2024-02-21 21:05:28 -0600
committerKiritoDv <kiritodev01@gmail.com>2024-02-21 21:05:28 -0600
commit1682451d2e2e510dfd213f963911dabb0e328b8f (patch)
treeca620e30d163c72a913b6ad751b85194dea97256
parentb8bcb110c2fba991cad049743073ffc7ece1143e (diff)
Fixed windows compilation
-rw-r--r--lib/n64graphics/n64graphics.c4
-rw-r--r--lib/n64graphics/stb_image_write.h1
-rw-r--r--src/Companion.cpp2
3 files changed, 6 insertions, 1 deletions
diff --git a/lib/n64graphics/n64graphics.c b/lib/n64graphics/n64graphics.c
index cca1a61..0ff7bc7 100644
--- a/lib/n64graphics/n64graphics.c
+++ b/lib/n64graphics/n64graphics.c
@@ -1,6 +1,10 @@
#include <stdio.h>
#include <stdlib.h>
+#if defined(_WIN32) || defined(_WIN64)
+#include <string.h>
+#else
#include <strings.h>
+#endif
#define STBI_NO_LINEAR
#define STBI_NO_HDR
diff --git a/lib/n64graphics/stb_image_write.h b/lib/n64graphics/stb_image_write.h
index 465ea3b..1655877 100644
--- a/lib/n64graphics/stb_image_write.h
+++ b/lib/n64graphics/stb_image_write.h
@@ -152,6 +152,7 @@ LICENSE
#define INCLUDE_STB_IMAGE_WRITE_H
#include <stdlib.h>
+#include <stdint.h>
// if STB_IMAGE_WRITE_STATIC causes problems, try defining STBIWDEF to 'inline' or 'static inline'
#ifndef STBIWDEF
diff --git a/src/Companion.cpp b/src/Companion.cpp
index a6e9aa3..a30afe6 100644
--- a/src/Companion.cpp
+++ b/src/Companion.cpp
@@ -192,7 +192,7 @@ void Companion::ParseModdingConfig() {
if(!fs::exists(path)) {
throw std::runtime_error("No modding config found, please run in export mode first");
}
- auto modding = YAML::LoadFile(path);
+ auto modding = YAML::LoadFile(path.string());
for(auto assets = modding["assets"].begin(); assets != modding["assets"].end(); ++assets) {
auto name = assets->first.as<std::string>();
auto asset = assets->second.as<std::string>();