summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-04-18 03:35:30 +0000
committerDavid Robillard <d@drobilla.net>2011-04-18 03:35:30 +0000
commit3cd3bfe5079f84fafb7dc217f5393d6ba947109c (patch)
tree6aadd344bc4b1d815c6f5e32fde6fc5177bafe0b
parent1776fe75458a11eeaa5ed0c26c6c9aa0e93f6f2c (diff)
downloadingen-3cd3bfe5079f84fafb7dc217f5393d6ba947109c.tar.gz
ingen-3cd3bfe5079f84fafb7dc217f5393d6ba947109c.tar.bz2
ingen-3cd3bfe5079f84fafb7dc217f5393d6ba947109c.zip
Remove wscript references to no longer existent ingen_module library.
Remove nonsensical dynamic loading of ingen_client library. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3158 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/engine/wscript2
-rw-r--r--src/gui/wscript2
-rw-r--r--src/ingen/main.cpp5
-rw-r--r--src/ingen/wscript2
4 files changed, 3 insertions, 8 deletions
diff --git a/src/engine/wscript b/src/engine/wscript
index 1a801b92..987779fd 100644
--- a/src/engine/wscript
+++ b/src/engine/wscript
@@ -124,6 +124,6 @@ def build(bld):
obj.name = 'libingen_lv2'
obj.target = 'ingen_lv2'
obj.install_path = '${LIBDIR}'
- obj.use = 'libingen_shared libingen_module'
+ obj.use = 'libingen_shared'
obj.add_objects = 'libingen_engine'
autowaf.use_lib(bld, obj, core_libs)
diff --git a/src/gui/wscript b/src/gui/wscript
index 49d19fa1..9eb4666d 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -50,7 +50,7 @@ def build(bld):
obj.name = 'libingen_gui'
obj.target = 'ingen_gui'
obj.install_path = '${LIBDIR}'
- obj.use = 'libingen_shared libingen_module libingen_client libingen_serialisation'
+ obj.use = 'libingen_shared libingen_client libingen_serialisation'
autowaf.use_lib(bld, obj, '''
CURL
FLOWCANVAS
diff --git a/src/ingen/main.cpp b/src/ingen/main.cpp
index dd2e5057..ceb50397 100644
--- a/src/ingen/main.cpp
+++ b/src/ingen/main.cpp
@@ -140,11 +140,6 @@ main(int argc, char** argv)
}
}
- // Load client library (required for patch loading and/or GUI)
- if (conf.option("load").is_valid() || conf.option("gui").get_bool())
- ingen_try(world->load_module("client"),
- "Unable to load client module");
-
// If we don't have a local engine interface (for GUI), use network
if (!engine_interface) {
const char* const uri = conf.option("connect").get_string();
diff --git a/src/ingen/wscript b/src/ingen/wscript
index 53ccef7b..d2ad1d6e 100644
--- a/src/ingen/wscript
+++ b/src/ingen/wscript
@@ -7,7 +7,7 @@ def build(bld):
obj.source = 'main.cpp'
obj.includes = ['..', '../..', '../../include']
obj.defines = 'VERSION="' + bld.env['INGEN_VERSION'] + '"'
- obj.use = 'libingen_module libingen_shared'
+ obj.use = 'libingen_shared'
obj.install_path = '${BINDIR}'
autowaf.use_lib(bld, obj, 'GTHREAD GLIBMM SORD RAUL LV2CORE SLV2 INGEN LIBLO SOUP')