diff options
| author | KiritoDv <kiritodev01@gmail.com> | 2024-05-25 13:23:19 -0600 |
|---|---|---|
| committer | KiritoDv <kiritodev01@gmail.com> | 2024-05-25 13:23:19 -0600 |
| commit | 1b06b44e67ec8f63af3cdcecdabf402405ff9493 (patch) | |
| tree | 510a200d9c14becad326c92c9a77d78e833bc708 | |
| parent | c1efb832f5ced7b7c6a5573d6bcdae2613aabf0e (diff) | |
Fixed stupid libultraship conflicts
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/factories/BaseFactory.h | 4 | ||||
| -rw-r--r-- | src/main.cpp | 3 | ||||
| -rw-r--r-- | src/utils/Decompressor.h | 2 |
4 files changed, 13 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 206aeaa..abfe76b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,6 +43,7 @@ endif() # Source files +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/lib) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src) file(GLOB_RECURSE CXX_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/**/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/lib/strhash64/*.cpp) @@ -198,4 +199,11 @@ if((CMAKE_SYSTEM_NAME MATCHES "Windows") AND ("${CMAKE_CXX_COMPILER_ID}" MATCHES endif() if (CMAKE_SYSTEM_NAME STREQUAL "NintendoSwitch") target_compile_definitions(storm PRIVATE -D_POSIX_C_SOURCE=200809L) +endif() + +if(NOT USE_STANDALONE) +target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/lib) +target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src) +target_include_directories(${PROJECT_NAME} PUBLIC ${yaml-cpp_SOURCE_DIR}/include) endif()
\ No newline at end of file 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, |