From 37f139a2369672bd8ca7e7a7430494a958c1bfdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Capelle?= Date: Mon, 1 Jul 2024 17:13:21 +0200 Subject: [PATCH] Modification to use external DDS.h header in MO2. (#4) --- CMakeLists.txt | 10 ++++------ {src => dds}/dds.h | 0 src/libbsarch.h | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) rename {src => dds}/dds.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d9d316..2dad128 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,12 +7,11 @@ project(libbsarch CXX) # Add library to build. add_library(libbsarch SHARED - src/DDS.h src/libbsarch.h src/libbsarch.cpp src/libbsarch.def - ) - +) +target_include_directories(libbsarch PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/dds) target_compile_features(libbsarch PRIVATE cxx_std_11) # Preprocessor definitions @@ -50,11 +49,9 @@ add_library(libbsarch_OOP STATIC src/bs_archive.h src/bs_archive_entries.cpp src/bs_archive_entries.h - src/dds.h src/libbsarch.hpp src/libbsarch.h - src/dds.h src/utils/convertible_string.cpp src/utils/convertible_string.hpp @@ -62,7 +59,8 @@ add_library(libbsarch_OOP STATIC src/utils/convertible_ostream.hpp src/utils/string_convert.cpp src/utils/string_convert.hpp - ) +) +target_include_directories(libbsarch_OOP PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/dds) ## Copying the corresponding DLL ## diff --git a/src/dds.h b/dds/dds.h similarity index 100% rename from src/dds.h rename to dds/dds.h diff --git a/src/libbsarch.h b/src/libbsarch.h index fea70dc..d0f4371 100644 --- a/src/libbsarch.h +++ b/src/libbsarch.h @@ -1,7 +1,7 @@ #pragma once -#include "dds.h" #include +#include #include #ifdef BSARCH_DLL_EXPORT