diff options
| author | David Robillard <d@drobilla.net> | 2008-10-01 16:58:33 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-10-01 16:58:33 +0000 |
| commit | d58eba655118adfa3c24ae74fb06eab5dedb9397 (patch) | |
| tree | 974a795eb9525f44ba29043c059a479bf0bd0228 /src/gui | |
| parent | a6f5b04414bd6ffce5f0aae0be9216e0b2fe2fad (diff) | |
| download | ingen-d58eba655118adfa3c24ae74fb06eab5dedb9397.tar.gz ingen-d58eba655118adfa3c24ae74fb06eab5dedb9397.tar.bz2 ingen-d58eba655118adfa3c24ae74fb06eab5dedb9397.zip | |
Fix building without libsoup.
Documentation building either globally or per project.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1574 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/ConnectWindow.cpp | 13 | ||||
| -rw-r--r-- | src/gui/wscript | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp index 5600a0b2..dca29a2d 100644 --- a/src/gui/ConnectWindow.cpp +++ b/src/gui/ConnectWindow.cpp @@ -28,9 +28,13 @@ #include "engine/tuning.hpp" #include "engine/Engine.hpp" #include "engine/QueuedEngineInterface.hpp" -#include "client/OSCClientReceiver.hpp" +#ifdef HAVE_SOUP #include "client/HTTPClientReceiver.hpp" +#endif +#ifdef HAVE_LIBLO +#include "client/OSCClientReceiver.hpp" #include "client/OSCEngineSender.hpp" +#endif #include "client/ThreadedSigClientInterface.hpp" #include "client/ClientStore.hpp" #include "client/PatchModel.hpp" @@ -155,6 +159,7 @@ ConnectWindow::connect(bool existing) Ingen::Shared::World* world = App::instance().world(); +#ifdef HAVE_LIBLO if (_mode == CONNECT_REMOTE) { if (!existing) { const string url = (_widgets_loaded ? (string)_url_entry->get_text() : world->engine->uri()); @@ -168,8 +173,10 @@ ConnectWindow::connect(bool existing) const string& scheme = uri.substr(0, uri.find(":")); if (scheme == "osc.udp" || scheme == "osc.tcp") client = SharedPtr<OSCClientReceiver>(new OSCClientReceiver(16181, tsci)); // FIXME: port +#ifdef HAVE_SOUP else if (scheme == "http") client = SharedPtr<HTTPClientReceiver>(new HTTPClientReceiver(world, uri, tsci)); +#endif App::instance().attach(tsci, client); App::instance().register_callbacks(); @@ -202,7 +209,9 @@ ConnectWindow::connect(bool existing) cerr << "Failed to launch ingen process." << endl; } - } else if (_mode == INTERNAL) { + } else +#endif + if (_mode == INTERNAL) { Ingen::Shared::World* world = App::instance().world(); if ( ! world->local_engine) { assert(_new_engine); diff --git a/src/gui/wscript b/src/gui/wscript index c4cf8302..4965f257 100644 --- a/src/gui/wscript +++ b/src/gui/wscript @@ -38,7 +38,7 @@ def build(bld): gui.cpp ''' - if bld.env()['HAVE_CURL']: + if bld.env()['HAVE_CURL'] != 0: obj.source += 'UploadPatchWindow.cpp' obj.includes = ['..', '../common'] |