diff options
| author | David Robillard <d@drobilla.net> | 2011-01-10 08:05:01 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-01-10 08:05:01 +0000 |
| commit | ee76b8535cdd63311e77611832c744a2f9d1c3d3 (patch) | |
| tree | 42b361809e0db62baba3f036da72e017d62d2943 /src/module | |
| parent | d6a3c886895f1de314569c39a00005c2c2272c13 (diff) | |
| download | ingen-ee76b8535cdd63311e77611832c744a2f9d1c3d3.tar.gz ingen-ee76b8535cdd63311e77611832c744a2f9d1c3d3.tar.bz2 ingen-ee76b8535cdd63311e77611832c744a2f9d1c3d3.zip | |
Fix module loading on OSX (this revision of Ingen confirmed working on Mac OS X 10.6.6 w/ MacPorts).
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2820 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/module')
| -rw-r--r-- | src/module/World.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/module/World.cpp b/src/module/World.cpp index 204cbdfa..43850b1a 100644 --- a/src/module/World.cpp +++ b/src/module/World.cpp @@ -58,7 +58,7 @@ load_module(const string& name) string dir; istringstream iss(module_path); while (getline(iss, dir, ':')) { - string filename = Glib::Module::build_path(dir, name); + string filename = Shared::module_path(name, dir); if (Glib::file_test(filename, Glib::FILE_TEST_EXISTS)) { module = new Glib::Module(filename, Glib::MODULE_BIND_LAZY); if (*module) { @@ -73,10 +73,8 @@ load_module(const string& name) } // Try default directory if not found - module = new Glib::Module( - Shared::module_path(name), - Glib::MODULE_BIND_LAZY); - + module = new Glib::Module(Shared::module_path(name), Glib::MODULE_BIND_LAZY); + // FIXME: SEGV on exit without this module->make_resident(); |