diff options
| author | David Robillard <d@drobilla.net> | 2008-09-30 18:20:57 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-09-30 18:20:57 +0000 |
| commit | e1d59a67788fd40ae5319a664bb36306b65de70a (patch) | |
| tree | 843328e0f1e75db8cc70274edd24d1cac560f3ba /src/module | |
| parent | 7a855a56a1eabd1b46543eab424257c658ff770b (diff) | |
| download | ingen-e1d59a67788fd40ae5319a664bb36306b65de70a.tar.gz ingen-e1d59a67788fd40ae5319a664bb36306b65de70a.tar.bz2 ingen-e1d59a67788fd40ae5319a664bb36306b65de70a.zip | |
Working ingen when built/installed via waf.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1554 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/module')
| -rw-r--r-- | src/module/Module.cpp | 9 | ||||
| -rw-r--r-- | src/module/wscript | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/module/Module.cpp b/src/module/Module.cpp index 8d1399b1..76f9baac 100644 --- a/src/module/Module.cpp +++ b/src/module/Module.cpp @@ -77,9 +77,14 @@ load_module(const string& name) if (*module) { cerr << "Loaded module \"" << name << "\" from " << INGEN_MODULE_DIR << endl; return SharedPtr<Glib::Module>(module); + } else if (!module_path_found) { + cerr << "Unable to find module " << name + << " (" << Glib::Module::get_last_error() << ")" << endl; + return SharedPtr<Glib::Module>(); } else { - cerr << "Unable to load module \"" << name << "\", is Ingen installed?" << endl - << "Use ./ingen.dev to run from the source tree." << endl; + cerr << "Unable to load module " << name << " from " << module_path + << " (" << Glib::Module::get_last_error() << ")" << endl; + cerr << "Is Ingen installed? Use ./ingen.dev to run from the source tree." << endl; return SharedPtr<Glib::Module>(); } } diff --git a/src/module/wscript b/src/module/wscript index fb9f9c93..bdcbebc9 100644 --- a/src/module/wscript +++ b/src/module/wscript @@ -2,7 +2,7 @@ import Params def build(bld): - dir = Params.g_options.moduledir or bld.env()['PREFIX'] + 'lib/ingen' + dir = Params.g_options.moduledir or bld.env()['PREFIX'] + 'lib' obj = bld.create_obj('cpp', 'shlib') obj.source = ''' Module.cpp |