Working ingen when built/installed via waf.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1554 a436a847-0d15-0410-975c-d299462d15a1

5 files changed, 23 insertions, 5 deletions

diff --git a/src/engine/wscript b/src/engine/wscript
index 2fbd6a23..5a115108 100644
--- a/src/engine/wscript
+++ b/src/engine/wscript
@@ -14,6 +14,7 @@ def build(bld):
 		Event.cpp
 		EventBuffer.cpp
 		EventSink.cpp
+		GraphObjectImpl.cpp
 		InputPort.cpp
 		InternalPlugin.cpp
 		JackAudioDriver.cpp
@@ -31,6 +32,7 @@ def build(bld):
 		OSCEngineReceiver.cpp
 		ObjectSender.cpp
 		OutputPort.cpp
+		PatchImpl.cpp
 		PluginImpl.cpp
 		PortImpl.cpp
 		PostProcessor.cpp
@@ -41,13 +43,16 @@ def build(bld):
 		TransportNode.cpp
 		engine.cpp
 		events/AllNotesOffEvent.cpp
+		events/ClearPatchEvent.cpp
 		events/ConnectionEvent.cpp
 		events/CreateNodeEvent.cpp
+		events/CreatePatchEvent.cpp
 		events/CreatePortEvent.cpp
 		events/DeactivateEvent.cpp
 		events/DestroyEvent.cpp
 		events/DisconnectAllEvent.cpp
 		events/DisconnectionEvent.cpp
+		events/EnablePatchEvent.cpp
 		events/LoadPluginsEvent.cpp
 		events/MidiLearnEvent.cpp
 		events/NoteEvent.cpp
@@ -62,6 +67,8 @@ def build(bld):
 		events/SendPortActivityEvent.cpp
 		events/SendPortValueEvent.cpp
 		events/SetMetadataEvent.cpp
+		events/SetPolyphonicEvent.cpp
+		events/SetPolyphonyEvent.cpp
 		events/SetPortValueEvent.cpp
 		events/UnregisterClientEvent.cpp
 	'''
diff --git a/src/gui/wscript b/src/gui/wscript
index f8ea297a..31ecdea7 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -41,7 +41,7 @@ def build(bld):
 	if bld.env()['HAVE_CURL']:
 		obj.source += 'UploadPatchWindow.cpp'
 
-	dir = Params.g_options.moduledir or bld.env()['PREFIX'] + 'lib/ingen'
+	dir = Params.g_options.datadir or bld.env()['PREFIX'] + 'share/ingen'
 
 	obj.includes       = ['..', '../common']
 	obj.defines        = 'INGEN_DATA_DIR=\\\"' + dir + '\\\"'
@@ -63,3 +63,9 @@ def build(bld):
 		SOUP
 		XML2
 	'''
+	
+	# GUI runtime files
+	install_files(dir, '', 'ingen_gui.glade')
+	install_files(dir, '', 'ingen.svg')
+
+
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
diff --git a/wscript b/wscript
index 5038e69b..3da79be8 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import Params
 
 # Variables for 'waf dist'
-VERSION = 'svn'
+VERSION = '0.0.0'
 APPNAME = 'ingen'
 
 # Mandatory variables