diff --git a/src/CLI/LoadPrintData.cpp b/src/CLI/LoadPrintData.cpp index fa64c43dc8..633bbc2844 100644 --- a/src/CLI/LoadPrintData.cpp +++ b/src/CLI/LoadPrintData.cpp @@ -11,10 +11,10 @@ #include "libslic3r/Config.hpp" #include "libslic3r/GCode/PostProcessor.hpp" #include "libslic3r/Model.hpp" -#include "libslic3r/ProfilesSharingUtils.hpp" #include "libslic3r/FileReader.hpp" -#include "CLI.hpp" +#include "CLI/CLI.hpp" +#include "CLI/ProfilesSharingUtils.hpp" namespace Slic3r::CLI { diff --git a/src/CLI/ProcessActions.cpp b/src/CLI/ProcessActions.cpp index 1a3452fa85..3d7254733f 100644 --- a/src/CLI/ProcessActions.cpp +++ b/src/CLI/ProcessActions.cpp @@ -23,7 +23,6 @@ #include "libslic3r/GCode/PostProcessor.hpp" #include "libslic3r/Model.hpp" #include "libslic3r/Preset.hpp" -#include "libslic3r/ProfilesSharingUtils.hpp" #include #include "libslic3r/Print.hpp" #include "libslic3r/SLAPrint.hpp" @@ -37,7 +36,8 @@ #include "libslic3r/MultipleBeds.hpp" #include "libslic3r/BuildVolume.hpp" -#include "CLI.hpp" +#include "CLI/CLI.hpp" +#include "CLI/ProfilesSharingUtils.hpp" #define STB_IMAGE_RESIZE_IMPLEMENTATION #include "stb_image_resize2.h" diff --git a/src/libslic3r/ProfilesSharingUtils.cpp b/src/CLI/ProfilesSharingUtils.cpp similarity index 98% rename from src/libslic3r/ProfilesSharingUtils.cpp rename to src/CLI/ProfilesSharingUtils.cpp index df83b4a541..70ce29b2e1 100644 --- a/src/libslic3r/ProfilesSharingUtils.cpp +++ b/src/CLI/ProfilesSharingUtils.cpp @@ -3,13 +3,13 @@ ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher ///|/ #include "ProfilesSharingUtils.hpp" -#include "Utils.hpp" -#include "format.hpp" -#include "PrintConfig.hpp" -#include "PresetBundle.hpp" -#include "Utils/DirectoriesUtils.hpp" -#include "Utils/JsonUtils.hpp" -#include "BuildVolume.hpp" +#include "libslic3r/Utils.hpp" +#include "libslic3r/format.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/PresetBundle.hpp" +#include "libslic3r/Utils/DirectoriesUtils.hpp" +#include "libslic3r/Utils/JsonUtils.hpp" +#include "libslic3r/BuildVolume.hpp" #include diff --git a/src/libslic3r/ProfilesSharingUtils.hpp b/src/CLI/ProfilesSharingUtils.hpp similarity index 97% rename from src/libslic3r/ProfilesSharingUtils.hpp rename to src/CLI/ProfilesSharingUtils.hpp index d4e18f2a54..7e6d12d4d9 100644 --- a/src/libslic3r/ProfilesSharingUtils.hpp +++ b/src/CLI/ProfilesSharingUtils.hpp @@ -6,7 +6,7 @@ #define slic3r_ProfilesSharingUtils_hpp_ #include -#include "Config.hpp" +#include "libslic3r/Config.hpp" namespace Slic3r { diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ff579e82e7..c6ddf2e1d4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -109,6 +109,8 @@ set(SLIC3R_CLI_SOURCES CLI/ProcessTransform.cpp CLI/ProcessActions.cpp CLI/Run.cpp + CLI/ProfilesSharingUtils.cpp + CLI/ProfilesSharingUtils.hpp ) if (SLIC3R_GUI) list(APPEND SLIC3R_CLI_SOURCES diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt index a880518ca3..d8c8d1e069 100644 --- a/src/libslic3r/CMakeLists.txt +++ b/src/libslic3r/CMakeLists.txt @@ -500,8 +500,6 @@ set(SLIC3R_SOURCES Arachne/WallToolPaths.hpp Arachne/WallToolPaths.cpp StaticMap.hpp - ProfilesSharingUtils.hpp - ProfilesSharingUtils.cpp Utils/DirectoriesUtils.hpp Utils/DirectoriesUtils.cpp Utils/JsonUtils.hpp