diff options
| author | David Robillard <d@drobilla.net> | 2010-06-04 21:45:29 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2010-06-04 21:45:29 +0000 |
| commit | 6805fbe127e9c56fbc09e88b5e30e51b945ea701 (patch) | |
| tree | 2a3ae18306718040c15f3680ba6ca358e8b3d8d0 /src | |
| parent | 69a622214fcce75e59a768a0a17999220a807630 (diff) | |
| download | ingen-6805fbe127e9c56fbc09e88b5e30e51b945ea701.tar.gz ingen-6805fbe127e9c56fbc09e88b5e30e51b945ea701.tar.bz2 ingen-6805fbe127e9c56fbc09e88b5e30e51b945ea701.zip | |
Run unit tests even if lcov is unavailable.
Library path kludges for building against MacPorts on OSX.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2576 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
| -rw-r--r-- | src/shared/runtime_paths.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/shared/runtime_paths.cpp b/src/shared/runtime_paths.cpp index 832c3472..a65131fb 100644 --- a/src/shared/runtime_paths.cpp +++ b/src/shared/runtime_paths.cpp @@ -87,10 +87,17 @@ data_file_path(const std::string& name) std::string module_path(const std::string& name) { + std::string ret; #ifdef BUNDLE - return Glib::Module::build_path(Glib::build_path(bundle_path, INGEN_MODULE_DIR), name); + ret = Glib::Module::build_path(Glib::build_path(bundle_path, INGEN_MODULE_DIR), name); #else - return Glib::Module::build_path(INGEN_MODULE_DIR, name); + ret = Glib::Module::build_path(INGEN_MODULE_DIR, name); +#endif +#ifdef __APPLE__ + // MacPorts glib doesnt seem to do portable path building correctly... + if (ret.substr(ret.length() - 3) == ".so") + ret = ret.substr(0, ret.length() - 2).append("dylib"); + return ret; #endif } |