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

Use resources dir for occt shared lib

Browse source
This commit is contained in:
tamasmeszaros 2022-07-27 13:39:38 +02:00 • committed by Lukas Matena
parent 7d3f0b4b32
commit 1fd4659f0e
5 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/libslic3r/Format/STEP.cpp
View file

@ -3,6 +3,9 @@
#include "libslic3r/Model.hpp"
#include "libslic3r/TriangleMesh.hpp"
#include "libslic3r/Utils.hpp"
#include <boost/filesystem.hpp>
#include <string>
#include <functional>
@ -24,8 +27,10 @@ LoadStepFn get_load_step_fn()
constexpr const char* fn_name = "load_step_internal";
if (!load_step_fn) {
auto libpath = boost::filesystem::path(resources_dir()) / "plugins";
#ifdef _WIN32
HMODULE module = LoadLibraryW(L"OCCTWrapper.dll");
libpath /= "OCCTWrapper.dll";
HMODULE module = LoadLibraryW(libpath.wstring().c_str());
if (module == NULL)
throw Slic3r::RuntimeError("Cannot load OCCTWrapper.dll");
@ -42,18 +47,17 @@ LoadStepFn get_load_step_fn()
throw;
}
#else
void *plugin_ptr = dlopen("OCCTWrapper.so", RTLD_NOW | RTLD_GLOBAL);
libpath /= "OCCTWrapper.so";
void *plugin_ptr = dlopen(libpath.c_str(), RTLD_NOW | RTLD_GLOBAL);
if (plugin_ptr) {
load_step_fn = reinterpret_cast<LoadStepFn>(dlsym(plugin_ptr, "load_step_internal"));
load_step_fn = reinterpret_cast<LoadStepFn>(dlsym(plugin_ptr, fn_name));
if (!load_step_fn) {
dlclose(plugin_ptr);
throw Slic3r::RuntimeError("Cannot load function from OCCTWrapper.so");
BOOST_LOG_TRIVIAL(error) << dlerror();
}
} else {
throw Slic3r::RuntimeError(
std::string("Cannot load function from OCCTWrapper.dll: ") +
fn_name + "\n\nError code: " + dlerror());
BOOST_LOG_TRIVIAL(error) << dlerror();
}
#endif
}