diff --git a/Libraries/CMakeLists.txt b/Libraries/CMakeLists.txt index 9018b17..94ea6b8 100644 --- a/Libraries/CMakeLists.txt +++ b/Libraries/CMakeLists.txt @@ -1,2 +1,3 @@ +add_subdirectory(Common) add_subdirectory(Kanimaji) add_subdirectory(Megane) diff --git a/Libraries/Common/CMakeLists.txt b/Libraries/Common/CMakeLists.txt new file mode 100644 index 0000000..923fc2b --- /dev/null +++ b/Libraries/Common/CMakeLists.txt @@ -0,0 +1,11 @@ +add_library(KVGToolsCommon INTERFACE) + +target_compile_features(KVGToolsCommon + INTERFACE + cxx_std_23 +) + +target_include_directories(KVGToolsCommon + INTERFACE + "Include" +) diff --git a/Libraries/Kanimaji/Include/Kanimaji/RGB.hpp b/Libraries/Common/Include/Common/RGB.hpp similarity index 96% rename from Libraries/Kanimaji/Include/Kanimaji/RGB.hpp rename to Libraries/Common/Include/Common/RGB.hpp index b322879..3ca82a5 100644 --- a/Libraries/Kanimaji/Include/Kanimaji/RGB.hpp +++ b/Libraries/Common/Include/Common/RGB.hpp @@ -1,11 +1,11 @@ -#ifndef KANIMAJI_RGB_HPP -#define KANIMAJI_RGB_HPP +#ifndef KVG_TOOLS_COMMON_RGB_HPP +#define KVG_TOOLS_COMMON_RGB_HPP #include #include #include -namespace Kanimaji +namespace Common { namespace Implementation { @@ -108,4 +108,4 @@ namespace Kanimaji }; } -#endif // KANIMAJI_RGB_HPP +#endif // KVG_TOOLS_COMMON_RGB_HPP diff --git a/Libraries/Kanimaji/CMakeLists.txt b/Libraries/Kanimaji/CMakeLists.txt index b7deb4f..7c72c1b 100644 --- a/Libraries/Kanimaji/CMakeLists.txt +++ b/Libraries/Kanimaji/CMakeLists.txt @@ -8,6 +8,9 @@ target_compile_features(Kanimaji ) target_link_libraries(Kanimaji + PUBLIC + KVGToolsCommon + PRIVATE pugixml ) diff --git a/Libraries/Kanimaji/Include/Kanimaji/Settings.hpp b/Libraries/Kanimaji/Include/Kanimaji/Settings.hpp index f2ee290..47496fa 100644 --- a/Libraries/Kanimaji/Include/Kanimaji/Settings.hpp +++ b/Libraries/Kanimaji/Include/Kanimaji/Settings.hpp @@ -1,13 +1,15 @@ #ifndef KANIMAJI_CONFIG_HPP #define KANIMAJI_CONFIG_HPP -#include "RGB.hpp" +#include #include #include namespace Kanimaji { + using Common::RGB; + enum class Flag { Enable, Disable, }; diff --git a/Tools/KanimajiTool/CMakeLists.txt b/Tools/KanimajiTool/CMakeLists.txt index 3724680..d194754 100644 --- a/Tools/KanimajiTool/CMakeLists.txt +++ b/Tools/KanimajiTool/CMakeLists.txt @@ -8,7 +8,6 @@ target_compile_features(KanimajiTool target_link_libraries(KanimajiTool PRIVATE Kanimaji - Megane ) target_sources(KanimajiTool