summaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/NodeFactory.cpp10
-rw-r--r--src/engine/NodeFactory.hpp2
-rw-r--r--src/engine/wscript40
3 files changed, 25 insertions, 27 deletions
diff --git a/src/engine/NodeFactory.cpp b/src/engine/NodeFactory.cpp
index 7e5375c2..8031e27b 100644
--- a/src/engine/NodeFactory.cpp
+++ b/src/engine/NodeFactory.cpp
@@ -31,7 +31,7 @@
#include "InternalTransport.hpp"
#include "PatchImpl.hpp"
#include "InternalPlugin.hpp"
-#ifdef HAVE_LADSPA
+#ifdef HAVE_LADSPA_H
#include "LADSPANode.hpp"
#include "LADSPAPlugin.hpp"
#endif
@@ -84,7 +84,7 @@ NodeFactory::plugin(const string& type, const string& lib, const string& label)
if (type != "LADSPA" || lib == "" || label == "")
return NULL;
-#ifdef HAVE_LADSPA
+#ifdef HAVE_LADSPA_H
for (Plugins::const_iterator i = _plugins.begin(); i != _plugins.end(); ++i) {
LADSPAPlugin* lp = dynamic_cast<LADSPAPlugin*>(i->second);
if (lp && lp->library_name() == lib
@@ -118,7 +118,7 @@ NodeFactory::load_plugins()
load_lv2_plugins();
#endif
-#ifdef HAVE_LADSPA
+#ifdef HAVE_LADSPA_H
load_ladspa_plugins();
#endif
@@ -189,7 +189,7 @@ NodeFactory::load_lv2_plugins()
#endif // HAVE_SLV2
-#ifdef HAVE_LADSPA
+#ifdef HAVE_LADSPA_H
/** Loads information about all LADSPA plugins into internal plugin database.
*/
void
@@ -281,7 +281,7 @@ NodeFactory::load_ladspa_plugins()
closedir(pdir);
}
}
-#endif // HAVE_LADSPA
+#endif // HAVE_LADSPA_H
} // namespace Ingen
diff --git a/src/engine/NodeFactory.hpp b/src/engine/NodeFactory.hpp
index 08a7ba3a..f25f31fa 100644
--- a/src/engine/NodeFactory.hpp
+++ b/src/engine/NodeFactory.hpp
@@ -68,7 +68,7 @@ public:
PluginImpl* plugin(const string& type, const string& lib, const string& label);
private:
-#ifdef HAVE_LADSPA
+#ifdef HAVE_LADSPA_H
void load_ladspa_plugins();
#endif
diff --git a/src/engine/wscript b/src/engine/wscript
index 01b63e84..1ab68cc7 100644
--- a/src/engine/wscript
+++ b/src/engine/wscript
@@ -1,5 +1,4 @@
#!/usr/bin/env python
-import Params
import autowaf
def build(bld):
@@ -37,21 +36,21 @@ def build(bld):
ingen_engine.cpp
'''
- obj = bld.create_obj('cpp', 'shlib')
+ obj = bld.new_task_gen('cxx', 'shlib')
obj.source = core_source
- if bld.env()['HAVE_LADSPA'] == 1:
+ if bld.env['HAVE_LADSPA_H'] == 1:
obj.source += ' LADSPAPlugin.cpp LADSPANode.cpp '
- if bld.env()['HAVE_SLV2'] == 1:
+ if bld.env['HAVE_SLV2'] == 1:
obj.source += ' LV2Info.cpp LV2Plugin.cpp LV2Node.cpp '
obj.includes = ['.', '..', '../common', './events']
obj.name = 'libingen_engine'
obj.target = 'ingen_engine'
- obj.inst_dir = bld.env()['LIBDIRNAME'] + 'ingen'
+ obj.install_path = '${LIBDIR}/ingen'
obj.uselib_local = 'libingen_shared'
core_libs = 'GLIBMM GTHREAD LV2CORE SLV2 RAUL REDLANDMM'
autowaf.use_lib(bld, obj, core_libs)
- obj = bld.create_obj('cpp', 'shlib')
+ obj = bld.new_task_gen('cxx', 'shlib')
obj.source = '''
events/SetPortValueEvent.cpp
QueuedEventSource.cpp
@@ -86,11 +85,11 @@ def build(bld):
obj.includes = ['.', '..', '../common', './events', '../engine']
obj.name = 'libingen_engine_queued'
obj.target = 'ingen_engine_queued'
- obj.inst_dir = bld.env()['LIBDIRNAME'] + 'ingen'
+ obj.install_path = '${LIBDIR}/ingen'
autowaf.use_lib(bld, obj, core_libs)
- if bld.env()['HAVE_SOUP'] == 1:
- obj = bld.create_obj('cpp', 'shlib')
+ if bld.env['HAVE_SOUP'] == 1:
+ obj = bld.new_task_gen('cxx', 'shlib')
obj.source = '''
QueuedEventSource.cpp
QueuedEngineInterface.cpp
@@ -100,11 +99,11 @@ def build(bld):
obj.includes = ['.', '..', '../common', './events', '../engine']
obj.name = 'libingen_engine_http'
obj.target = 'ingen_engine_http'
- obj.inst_dir = bld.env()['LIBDIRNAME'] + 'ingen'
+ obj.install_path = '${LIBDIR}/ingen'
autowaf.use_lib(bld, obj, core_libs + ' SOUP')
- if bld.env()['HAVE_LIBLO'] == 1:
- obj = bld.create_obj('cpp', 'shlib')
+ if bld.env['HAVE_LIBLO'] == 1:
+ obj = bld.new_task_gen('cxx', 'shlib')
obj.source = '''
QueuedEventSource.cpp
QueuedEngineInterface.cpp
@@ -114,30 +113,29 @@ def build(bld):
obj.includes = ['.', '..', '../common', './events', '../engine']
obj.name = 'libingen_engine_osc'
obj.target = 'ingen_engine_osc'
- obj.inst_dir = bld.env()['LIBDIRNAME'] + 'ingen'
+ obj.install_path = '${LIBDIR}/ingen'
autowaf.use_lib(bld, obj, core_libs + ' LIBLO')
- if bld.env()['HAVE_JACK'] == 1:
- obj = bld.create_obj('cpp', 'shlib')
+ if bld.env['HAVE_JACK'] == 1:
+ obj = bld.new_task_gen('cxx', 'shlib')
obj.source = 'JackAudioDriver.cpp JackMidiDriver.cpp'
obj.includes = ['.', '..', '../common', './events', '../engine']
obj.name = 'libingen_engine_jack'
obj.target = 'ingen_engine_jack'
- obj.inst_dir = bld.env()['LIBDIRNAME'] + 'ingen'
+ obj.install_path = '${LIBDIR}/ingen'
autowaf.use_lib(bld, obj, core_libs + ' JACK')
# Lightweight ingen/lv2 wrapper
- obj = bld.create_obj('cpp', 'shlib')
+ obj = bld.new_task_gen('cxx', 'shlib')
obj.source = core_source
- if bld.env()['HAVE_LADSPA'] == 1:
+ if bld.env['HAVE_LADSPA_H'] == 1:
obj.source += ' LADSPAPlugin.cpp LADSPANode.cpp '
- if bld.env()['HAVE_SLV2'] == 1:
+ if bld.env['HAVE_SLV2'] == 1:
obj.source += ' LV2Plugin.cpp LV2Node.cpp '
obj.includes = ['.', '..', '../common', './events']
obj.name = 'ingen_lv2'
obj.target = 'ingen.lv2/ingen_lv2'
- #obj.inst_dir = 'lib/lv2/ingen.lv2'
- obj.inst_var = 0
+ obj.install_path = ''
core_libs = 'GLIBMM GTHREAD LV2CORE SLV2 RAUL REDLANDMM'
autowaf.use_lib(bld, obj, core_libs)
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-04 02:22:26 +0000