3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Modified resources directory in Linux installation.

Browse source
This commit is contained in:
bubnikv 2018-09-21 16:38:42 +02:00
parent 0a7646cd94
commit c37dc44ec4
1 changed files with 14 additions and 1 deletions

13
src/slic3r.cpp
View file

@ -45,14 +45,27 @@ int main(int argc, char **argv)
boost::filesystem::path path_to_binary = boost::filesystem::system_complete(argv[0]); boost::filesystem::path path_to_binary = boost::filesystem::system_complete(argv[0]);
boost::filesystem::path path_resources = path_to_binary.parent_path(); boost::filesystem::path path_resources = path_to_binary.parent_path();
// Path from the Slic3r binary to its resources.
path_resources /= (path_to_binary.stem().string() == "slic3r-gui") ? path_resources /= (path_to_binary.stem().string() == "slic3r-gui") ?
// Running from the build directory: // Running from the build directory:
"../../resources" : "../../resources" :
// Running from an installation directory: // Running from an installation directory:
#if APPLE #if APPLE
// The application is packed in the .dmg archive as 'Slic3r.app/Contents/MacOS/Slic3r'
// The resources are packed to 'Slic3r.app/Contents/Resources'
"../Resources" "../Resources"
#else #else
#if WIN32
// The application is packed in the .zip archive in the root,
// The resources are packed to 'resources'
// Path from Slic3r binary to resources:
"resources" "resources"
#else
// The application is packed in the .tar.bz archive (or in AppImage) as 'bin/slic3r',
// The resources are packed to 'resources'
// Path from Slic3r binary to resources:
"../resources"
#endif
#endif #endif
; ;
set_resources_dir(path_resources.string()); set_resources_dir(path_resources.string());