diff options
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/AudioBuffer.cpp | 11 | ||||
| -rw-r--r-- | src/server/LV2Info.cpp | 2 | ||||
| -rw-r--r-- | src/server/LV2Node.cpp | 3 | ||||
| -rw-r--r-- | src/server/LV2Node.hpp | 7 | ||||
| -rw-r--r-- | src/server/PortImpl.cpp | 2 | ||||
| -rw-r--r-- | src/server/wscript | 89 |
6 files changed, 57 insertions, 57 deletions
diff --git a/src/server/AudioBuffer.cpp b/src/server/AudioBuffer.cpp index 7a8e7c48..86b5e835 100644 --- a/src/server/AudioBuffer.cpp +++ b/src/server/AudioBuffer.cpp @@ -16,13 +16,16 @@ */ #include <stdlib.h> -#include <cassert> -#include "raul/log.hpp" -#include "raul/SharedPtr.hpp" +#include <assert.h> + #include "lv2/lv2plug.in/ns/ext/atom/atom.h" +#include "raul/SharedPtr.hpp" +#include "raul/log.hpp" + +#include "shared/LV2Features.hpp" + #include "AudioBuffer.hpp" #include "ProcessContext.hpp" -#include "LV2Features.hpp" using namespace std; using namespace Raul; diff --git a/src/server/LV2Info.cpp b/src/server/LV2Info.cpp index 566277e7..83c77ace 100644 --- a/src/server/LV2Info.cpp +++ b/src/server/LV2Info.cpp @@ -25,9 +25,9 @@ #include "lv2/lv2plug.in/ns/ext/contexts/contexts.h" #include "shared/World.hpp" +#include "shared/LV2Features.hpp" #include "LV2EventFeature.hpp" -#include "LV2Features.hpp" #include "LV2Info.hpp" #include "LV2RequestRunFeature.hpp" #include "LV2ResizeFeature.hpp" diff --git a/src/server/LV2Node.cpp b/src/server/LV2Node.cpp index 6364266e..125beaee 100644 --- a/src/server/LV2Node.cpp +++ b/src/server/LV2Node.cpp @@ -26,12 +26,13 @@ #include "raul/Maid.hpp" #include "raul/Array.hpp" +#include "shared/LV2URIMap.hpp" + #include "AudioBuffer.hpp" #include "EventBuffer.hpp" #include "InputPort.hpp" #include "LV2Node.hpp" #include "LV2Plugin.hpp" -#include "LV2URIMap.hpp" #include "MessageContext.hpp" #include "OutputPort.hpp" #include "ProcessContext.hpp" diff --git a/src/server/LV2Node.hpp b/src/server/LV2Node.hpp index 6fc91afc..06c79c20 100644 --- a/src/server/LV2Node.hpp +++ b/src/server/LV2Node.hpp @@ -19,12 +19,15 @@ #define INGEN_ENGINE_LV2NODE_HPP #include <string> + #include <boost/intrusive_ptr.hpp> + #include "lilv/lilv.h" #include "lv2/lv2plug.in/ns/ext/contexts/contexts.h" -#include "types.hpp" + #include "NodeImpl.hpp" -#include "LV2Features.hpp" +#include "shared/LV2Features.hpp" +#include "types.hpp" namespace Ingen { namespace Server { diff --git a/src/server/PortImpl.cpp b/src/server/PortImpl.cpp index d4d947d1..f89d1c53 100644 --- a/src/server/PortImpl.cpp +++ b/src/server/PortImpl.cpp @@ -21,12 +21,12 @@ #include "raul/Maid.hpp" #include "shared/LV2URIMap.hpp" +#include "shared/LV2Atom.hpp" #include "AudioBuffer.hpp" #include "BufferFactory.hpp" #include "Engine.hpp" #include "EventBuffer.hpp" -#include "LV2Atom.hpp" #include "NodeImpl.hpp" #include "Notification.hpp" #include "ObjectBuffer.hpp" diff --git a/src/server/wscript b/src/server/wscript index e0c7a7d1..9b486d25 100644 --- a/src/server/wscript +++ b/src/server/wscript @@ -55,65 +55,58 @@ def build(bld): internals/Trigger.cpp ''' - obj = bld(features = 'cxx cxxshlib') - obj.source = core_source - obj.export_includes = ['.'] - obj.includes = ['.', '..', '../..', '../../include'] - obj.name = 'libingen_server' - obj.target = 'ingen_server' - obj.install_path = '${LIBDIR}' - obj.use = 'libingen_shared' + obj = bld(features = 'cxx cxxshlib', + source = core_source, + export_includes = ['../../include'], + includes = ['.', '..', '../..', '../../include'], + name = 'libingen_server', + target = 'ingen_server', + install_path = '${LIBDIR}', + use = 'libingen_shared') core_libs = 'GLIBMM GTHREAD LV2CORE LILV RAUL SORD' autowaf.use_lib(bld, obj, core_libs) if bld.is_defined('HAVE_SOUP'): - obj = bld(features = 'cxx cxxshlib') - obj.source = ''' - HTTPClientSender.cpp - HTTPEngineReceiver.cpp - ingen_http.cpp - ''' - obj.includes = ['.', '..', '../..', '../../include', '../server'] - obj.name = 'libingen_http' - obj.target = 'ingen_http' - obj.install_path = '${LIBDIR}' - obj.use = 'libingen_server' + obj = bld(features = 'cxx cxxshlib', + source = '''HTTPClientSender.cpp + HTTPEngineReceiver.cpp + ingen_http.cpp''', + includes = ['.', '..', '../..', '../../include'], + name = 'libingen_http', + target = 'ingen_http', + install_path = '${LIBDIR}', + use = 'libingen_server') autowaf.use_lib(bld, obj, core_libs + ' SOUP') if bld.is_defined('HAVE_LIBLO'): - obj = bld(features = 'cxx cxxshlib') - obj.source = ''' - OSCClientSender.cpp - OSCEngineReceiver.cpp - ingen_osc.cpp - ''' - obj.export_includes = ['.'] - obj.includes = ['.', '..', '../..', '../../include', '../server'] - obj.name = 'libingen_osc' - obj.target = 'ingen_osc' - obj.install_path = '${LIBDIR}' - obj.use = 'libingen_server' + obj = bld(features = 'cxx cxxshlib', + source = '''OSCClientSender.cpp + OSCEngineReceiver.cpp + ingen_osc.cpp''', + includes = ['.', '..', '../..', '../../include'], + name = 'libingen_osc', + target = 'ingen_osc', + install_path = '${LIBDIR}', + use = 'libingen_server') autowaf.use_lib(bld, obj, core_libs + ' LIBLO') if bld.is_defined('HAVE_JACK'): - obj = bld(features = 'cxx cxxshlib') - obj.source = 'JackDriver.cpp ingen_jack.cpp' - obj.export_includes = ['.'] - obj.includes = ['.', '..', '../..', '../../include', '../server'] - obj.name = 'libingen_jack' - obj.target = 'ingen_jack' - obj.install_path = '${LIBDIR}' - obj.use = 'libingen_server' + obj = bld(features = 'cxx cxxshlib', + source = 'JackDriver.cpp ingen_jack.cpp', + includes = ['.', '..', '../..', '../../include'], + name = 'libingen_jack', + target = 'ingen_jack', + install_path = '${LIBDIR}', + use = 'libingen_server') autowaf.use_lib(bld, obj, core_libs + ' JACK') # Ingen LV2 wrapper - obj = bld(features = 'cxx cxxshlib') - obj.source = ' ingen_lv2.cpp ' - obj.export_includes = ['.'] - obj.includes = ['.', '..', '../..', '../../include'] - obj.name = 'libingen_lv2' - obj.target = 'ingen_lv2' - #obj.install_path = '${LIBDIR}' - obj.install_path = '${LV2DIR}/ingen.lv2/' - obj.use = 'libingen_server libingen_shared' + obj = bld(features = 'cxx cxxshlib', + source = ' ingen_lv2.cpp ', + includes = ['.', '..', '../..', '../../include'], + name = 'libingen_lv2', + target = 'ingen_lv2', + #install_path = '${LIBDIR}', + install_path = '${LV2DIR}/ingen.lv2/', + use = 'libingen_server libingen_shared') autowaf.use_lib(bld, obj, core_libs) |