summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-09-30 18:20:57 +0000
committerDavid Robillard <d@drobilla.net>2008-09-30 18:20:57 +0000
commite1d59a67788fd40ae5319a664bb36306b65de70a (patch)
tree843328e0f1e75db8cc70274edd24d1cac560f3ba
parent7a855a56a1eabd1b46543eab424257c658ff770b (diff)
downloadingen-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
-rw-r--r--src/engine/wscript7
-rw-r--r--src/gui/wscript8
-rw-r--r--src/module/Module.cpp9
-rw-r--r--src/module/wscript2
-rw-r--r--wscript2
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