diff --git a/src/PrusaSlicer.cpp b/src/PrusaSlicer.cpp index 105078fa39..7dc94ddff1 100644 --- a/src/PrusaSlicer.cpp +++ b/src/PrusaSlicer.cpp @@ -61,11 +61,10 @@ #include "libslic3r/Utils.hpp" #include "libslic3r/Thread.hpp" #include "libslic3r/BlacklistedLibraryCheck.hpp" +#include "libslic3r/ProfilesSharingUtils.hpp" #include "PrusaSlicer.hpp" -#include "slic3r/Utils/ProfilesSharingUtils.hpp" - #ifdef SLIC3R_GUI #include "slic3r/GUI/GUI_Init.hpp" #endif /* SLIC3R_GUI */ diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt index afaff965c8..393157db13 100644 --- a/src/libslic3r/CMakeLists.txt +++ b/src/libslic3r/CMakeLists.txt @@ -508,8 +508,16 @@ set(SLIC3R_SOURCES Arachne/WallToolPaths.hpp Arachne/WallToolPaths.cpp StaticMap.hpp + ProfilesSharingUtils.hpp + ProfilesSharingUtils.cpp ) +if (APPLE) + list(APPEND SLIC3R_SOURCES + MacUtils.mm + ) +endif () + add_library(libslic3r STATIC ${SLIC3R_SOURCES}) if (WIN32) diff --git a/src/libslic3r/MacUtils.mm b/src/libslic3r/MacUtils.mm new file mode 100644 index 0000000000..30d3ab825d --- /dev/null +++ b/src/libslic3r/MacUtils.mm @@ -0,0 +1,17 @@ +#import "ProfilesSharingUtils.hpp" + +#import + +namespace Slic3r { + +// ProfilesSharingUtils.hpp +std::string GetDataDir() +{ + NSURL* url = [[NSFileManager defaultManager] URLForDirectory:NSApplicationSupportDirectory + inDomain:NSUserDomainMask + appropriateForURL:nil create:NO error:nil]; + + return std::string([(CFStringRef)url.path UTF8String]); +} + +} diff --git a/src/slic3r/Utils/ProfilesSharingUtils.cpp b/src/libslic3r/ProfilesSharingUtils.cpp similarity index 99% rename from src/slic3r/Utils/ProfilesSharingUtils.cpp rename to src/libslic3r/ProfilesSharingUtils.cpp index 92c19cca56..d25ce8184d 100644 --- a/src/slic3r/Utils/ProfilesSharingUtils.cpp +++ b/src/libslic3r/ProfilesSharingUtils.cpp @@ -3,10 +3,10 @@ ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher ///|/ #include "ProfilesSharingUtils.hpp" -#include "libslic3r/Utils.hpp" -#include "libslic3r/format.hpp" -#include "libslic3r/PrintConfig.hpp" -#include "libslic3r/PresetBundle.hpp" +#include "Utils.hpp" +#include "format.hpp" +#include "PrintConfig.hpp" +#include "PresetBundle.hpp" #include diff --git a/src/slic3r/Utils/ProfilesSharingUtils.hpp b/src/libslic3r/ProfilesSharingUtils.hpp similarity index 100% rename from src/slic3r/Utils/ProfilesSharingUtils.hpp rename to src/libslic3r/ProfilesSharingUtils.hpp diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt index d22dc873ce..fea794c943 100644 --- a/src/slic3r/CMakeLists.txt +++ b/src/slic3r/CMakeLists.txt @@ -335,8 +335,6 @@ set(SLIC3R_GUI_SOURCES Utils/WxFontUtils.hpp Utils/WifiScanner.hpp Utils/WifiScanner.cpp - Utils/ProfilesSharingUtils.hpp - Utils/ProfilesSharingUtils.cpp ) find_package(NanoSVG REQUIRED) diff --git a/src/slic3r/Utils/MacUtils.mm b/src/slic3r/Utils/MacUtils.mm index b570dd566d..5c54c2b90e 100644 --- a/src/slic3r/Utils/MacUtils.mm +++ b/src/slic3r/Utils/MacUtils.mm @@ -1,5 +1,4 @@ #import "AppUpdater.hpp" -#import "ProfilesSharingUtils.hpp" #import @@ -17,14 +16,4 @@ std::string get_downloads_path_mac() //return std::string(); } -// ProfilesSharingUtils.hpp -std::string GetDataDir() -{ - NSURL* url = [[NSFileManager defaultManager] URLForDirectory:NSApplicationSupportDirectory - inDomain:NSUserDomainMask - appropriateForURL:nil create:NO error:nil]; - - return std::string([(CFStringRef)url.path UTF8String]); -} - }