From 1b06b44e67ec8f63af3cdcecdabf402405ff9493 Mon Sep 17 00:00:00 2001
From: KiritoDv <kiritodev01@gmail.com>
Date: Sat, 25 May 2024 13:23:19 -0600
Subject: Fixed stupid libultraship conflicts

---
 src/factories/BaseFactory.h | 4 ++--
 src/main.cpp                | 3 ++-
 src/utils/Decompressor.h    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/factories/BaseFactory.h b/src/factories/BaseFactory.h
index ff2297f..aa41302 100644
--- a/src/factories/BaseFactory.h
+++ b/src/factories/BaseFactory.h
@@ -12,8 +12,8 @@
 #include <optional>
 #include <yaml-cpp/yaml.h>
 #include <strhash64/StrHash64.h>
-#include <binarytools/BinaryWriter.h>
-#include <binarytools/BinaryReader.h>
+#include "lib/binarytools/BinaryWriter.h"
+#include "lib/binarytools/BinaryReader.h"
 
 #define REGISTER(type, c) { ExportType::type, std::make_shared<c>() },
 
diff --git a/src/main.cpp b/src/main.cpp
index 7f6267b..ee1d92a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,9 +2,10 @@
 #include "CLI11.hpp"
 #include "Companion.h"
 
-#ifdef STANDALONE
 Companion* Companion::Instance;
 
+#ifdef STANDALONE
+
 int main(int argc, char *argv[]) {
     CLI::App app{"Torch - [T]orch is [O]ur [R]esource [C]onversion [H]elper\n\
         * It extracts from a baserom and generates code or an otr.\n\
diff --git a/src/utils/Decompressor.h b/src/utils/Decompressor.h
index da46d25..768ee17 100644
--- a/src/utils/Decompressor.h
+++ b/src/utils/Decompressor.h
@@ -6,7 +6,7 @@
 #include <yaml-cpp/yaml.h>
 #include <optional>
 #include <cstdint>
-#include "BinaryReader.h"
+#include "lib/binarytools/BinaryReader.h"
 
 enum class CompressionType {
     None,
-- 
cgit v1.2.3