diff --git a/src/libslic3r/MacUtils.mm b/src/libslic3r/MacUtils.mm index 30d3ab825d..ee1462fb79 100644 --- a/src/libslic3r/MacUtils.mm +++ b/src/libslic3r/MacUtils.mm @@ -1,10 +1,8 @@ -#import "ProfilesSharingUtils.hpp" +#import "Utils/DirectoriesUtils.hpp" #import -namespace Slic3r { - -// ProfilesSharingUtils.hpp +// Utils/DirectoriesUtils.hpp std::string GetDataDir() { NSURL* url = [[NSFileManager defaultManager] URLForDirectory:NSApplicationSupportDirectory @@ -14,4 +12,3 @@ std::string GetDataDir() return std::string([(CFStringRef)url.path UTF8String]); } -} diff --git a/src/libslic3r/ProfilesSharingUtils.hpp b/src/libslic3r/ProfilesSharingUtils.hpp index 5eafe899e3..89c1068333 100644 --- a/src/libslic3r/ProfilesSharingUtils.hpp +++ b/src/libslic3r/ProfilesSharingUtils.hpp @@ -11,11 +11,6 @@ std::string get_json_printer_models(PrinterTechnology printer_technology); //std::string get_json_printer_profiles(const std::string& printer_model, const std::string& printer_variant); std::string get_json_print_filament_profiles(const std::string& printer_profile); -#if __APPLE__ -//implemented at MacUtils.mm -std::string GetDataDir(); -#endif //__APPLE__ - class DynamicPrintConfig; bool load_full_print_config(const std::string& print_preset, const std::string& filament_preset, const std::string& printer_preset, DynamicPrintConfig& out_config); diff --git a/src/libslic3r/Utils/DirectoriesUtils.hpp b/src/libslic3r/Utils/DirectoriesUtils.hpp index b7cc5dbceb..cafc054708 100644 --- a/src/libslic3r/Utils/DirectoriesUtils.hpp +++ b/src/libslic3r/Utils/DirectoriesUtils.hpp @@ -1,6 +1,13 @@ #ifndef slic3r_DirectoriesUtils_hpp_ #define slic3r_DirectoriesUtils_hpp_ +#include + +#if __APPLE__ +//implemented at MacUtils.mm +std::string GetDataDir(); +#endif //__APPLE__ + namespace Slic3r { std::string get_default_datadir();