From ee76b8535cdd63311e77611832c744a2f9d1c3d3 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 10 Jan 2011 08:05:01 +0000 Subject: 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 --- src/module/World.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/module') 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(); -- cgit v1.2.1