summaryrefslogtreecommitdiffstats
path: root/src/shared
diff options
context:
space:
mode:
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/runtime_paths.cpp11
-rw-r--r--src/shared/runtime_paths.hpp2
2 files changed, 9 insertions, 4 deletions
diff --git a/src/shared/runtime_paths.cpp b/src/shared/runtime_paths.cpp
index 476bd2ba..f4ddd897 100644
--- a/src/shared/runtime_paths.cpp
+++ b/src/shared/runtime_paths.cpp
@@ -85,14 +85,19 @@ data_file_path(const std::string& name)
/** Return the absolute path of a module (dynamically loaded shared library).
*/
std::string
-module_path(const std::string& name)
+module_path(const std::string& name, std::string dir)
{
std::string ret;
+ if (dir == "") {
#ifdef BUNDLE
- ret = Glib::Module::build_path(Glib::build_path(bundle_path, INGEN_MODULE_DIR), name);
+ dir = Glib::build_path(bundle_path, INGEN_MODULE_DIR);
#else
- ret = Glib::Module::build_path(INGEN_MODULE_DIR, name);
+ dir = INGEN_MODULE_DIR;
#endif
+ }
+
+ ret = Glib::Module::build_path(dir, name);
+
#ifdef __APPLE__
// MacPorts glib doesnt seem to do portable path building correctly...
if (ret.substr(ret.length() - 3) == ".so")
diff --git a/src/shared/runtime_paths.hpp b/src/shared/runtime_paths.hpp
index c0c890c1..fcb29a7f 100644
--- a/src/shared/runtime_paths.hpp
+++ b/src/shared/runtime_paths.hpp
@@ -32,7 +32,7 @@ void set_bundle_path_from_code(void* function);
std::string bundle_file_path(const std::string& name);
std::string data_file_path(const std::string& name);
-std::string module_path(const std::string& name);
+std::string module_path(const std::string& name, std::string dir="");
} // namespace Ingen
} // namespace Shared