diff options
| author | David Robillard <d@drobilla.net> | 2008-10-03 21:25:30 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-10-03 21:25:30 +0000 |
| commit | aeaab905a0711aafef5a64a83a1a511d76f41842 (patch) | |
| tree | 58d36b30b97fec9299894a25c4bf88c36b91d016 /src/engine | |
| parent | f43e7d5346b4aed7935076f9422ba6b903a1d7c4 (diff) | |
| download | ingen-aeaab905a0711aafef5a64a83a1a511d76f41842.tar.gz ingen-aeaab905a0711aafef5a64a83a1a511d76f41842.tar.bz2 ingen-aeaab905a0711aafef5a64a83a1a511d76f41842.zip | |
Make liblo optional for building ingen.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1608 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/ClientBroadcaster.cpp | 1 | ||||
| -rw-r--r-- | src/engine/ClientBroadcaster.hpp | 1 | ||||
| -rw-r--r-- | src/engine/Engine.cpp | 4 | ||||
| -rw-r--r-- | src/engine/HTTPEngineReceiver.cpp | 1 | ||||
| -rw-r--r-- | src/engine/wscript | 4 |
5 files changed, 6 insertions, 5 deletions
diff --git a/src/engine/ClientBroadcaster.cpp b/src/engine/ClientBroadcaster.cpp index d754f072..f13743f6 100644 --- a/src/engine/ClientBroadcaster.cpp +++ b/src/engine/ClientBroadcaster.cpp @@ -30,7 +30,6 @@ #include "ConnectionImpl.hpp" #include "AudioDriver.hpp" #include "ObjectSender.hpp" -#include "OSCClientSender.hpp" using namespace std; using Ingen::Shared::ClientInterface; diff --git a/src/engine/ClientBroadcaster.hpp b/src/engine/ClientBroadcaster.hpp index b0963610..efb58450 100644 --- a/src/engine/ClientBroadcaster.hpp +++ b/src/engine/ClientBroadcaster.hpp @@ -21,7 +21,6 @@ #include <string> #include <list> #include <map> -#include <lo/lo.h> #include <pthread.h> #include <raul/SharedPtr.hpp> #include "interface/ClientInterface.hpp" diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp index 7445abc5..2e995281 100644 --- a/src/engine/Engine.cpp +++ b/src/engine/Engine.cpp @@ -39,7 +39,9 @@ #include "PostProcessor.hpp" #include "events/CreatePatchEvent.hpp" #include "events/EnablePatchEvent.hpp" +#ifdef HAVE_LIBLO #include "OSCEngineReceiver.hpp" +#endif #ifdef HAVE_SOUP #include "HTTPEngineReceiver.hpp" #endif @@ -173,6 +175,7 @@ Engine::start_jack_driver() void Engine::start_osc_driver(int port) { +#ifdef HAVE_LIBLO if (_event_source) { cerr << "WARNING: Replacing event source" << endl; _event_source.reset(); @@ -180,6 +183,7 @@ Engine::start_osc_driver(int port) _event_source = SharedPtr<EventSource>(new OSCEngineReceiver( *this, pre_processor_queue_size, port)); +#endif } diff --git a/src/engine/HTTPEngineReceiver.cpp b/src/engine/HTTPEngineReceiver.cpp index 1b21e184..58b2bbe8 100644 --- a/src/engine/HTTPEngineReceiver.cpp +++ b/src/engine/HTTPEngineReceiver.cpp @@ -22,7 +22,6 @@ #include <boost/format.hpp> #include "types.hpp" #include <raul/SharedPtr.hpp> -#include <raul/AtomLiblo.hpp> #include "interface/ClientInterface.hpp" #include "module/Module.hpp" #include "serialisation/serialisation.hpp" diff --git a/src/engine/wscript b/src/engine/wscript index 33809ab0..c10dc028 100644 --- a/src/engine/wscript +++ b/src/engine/wscript @@ -29,8 +29,6 @@ def build(bld): MidiTriggerNode.cpp NodeBase.cpp NodeFactory.cpp - OSCClientSender.cpp - OSCEngineReceiver.cpp ObjectSender.cpp OutputPort.cpp PatchImpl.cpp @@ -79,6 +77,8 @@ def build(bld): obj.source += ' LV2Node.cpp ' if bld.env()['HAVE_SOUP']: obj.source += ' HTTPEngineReceiver.cpp ' + if bld.env()['HAVE_LIBLO']: + obj.source += ' OSCEngineReceiver.cpp OSCClientSender.cpp ' obj.includes = ['..', '../common', './events'] obj.name = 'libingen_engine' obj.target = 'ingen_engine' |