summaryrefslogtreecommitdiffstats
path: root/src/server
diff options
context:
space:
mode:
Diffstat (limited to 'src/server')
-rw-r--r--src/server/HTTPClientSender.hpp2
-rw-r--r--src/server/OSCClientSender.hpp2
-rw-r--r--src/server/ingen_lv2.cpp26
-rw-r--r--src/server/wscript10
4 files changed, 20 insertions, 20 deletions
diff --git a/src/server/HTTPClientSender.hpp b/src/server/HTTPClientSender.hpp
index ae286af1..116f0601 100644
--- a/src/server/HTTPClientSender.hpp
+++ b/src/server/HTTPClientSender.hpp
@@ -24,7 +24,7 @@
#include "raul/Thread.hpp"
#include "ingen/ClientInterface.hpp"
-#include "shared/HTTPSender.hpp"
+#include "../shared/HTTPSender.hpp"
namespace Ingen {
diff --git a/src/server/OSCClientSender.hpp b/src/server/OSCClientSender.hpp
index 95f3ea4f..ffc3b202 100644
--- a/src/server/OSCClientSender.hpp
+++ b/src/server/OSCClientSender.hpp
@@ -25,7 +25,7 @@
#include "ingen/ClientInterface.hpp"
#include "ingen/GraphObject.hpp"
-#include "shared/OSCSender.hpp"
+#include "../shared/OSCSender.hpp"
namespace Ingen {
diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index af13680d..9554d6d5 100644
--- a/src/server/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -28,23 +28,23 @@
#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
-#include "raul/SharedPtr.hpp"
-#include "raul/Thread.hpp"
-#include "raul/log.hpp"
-
-#include "server/AudioBuffer.hpp"
-#include "server/Driver.hpp"
-#include "server/Engine.hpp"
-#include "server/PatchImpl.hpp"
-#include "server/PostProcessor.hpp"
-#include "server/ProcessContext.hpp"
-#include "server/QueuedEngineInterface.hpp"
-#include "server/ThreadManager.hpp"
#include "ingen/ServerInterface.hpp"
-#include "ingen/shared/World.hpp"
#include "ingen/serialisation/Parser.hpp"
#include "ingen/shared/Configuration.hpp"
+#include "ingen/shared/World.hpp"
#include "ingen/shared/runtime_paths.hpp"
+#include "raul/SharedPtr.hpp"
+#include "raul/Thread.hpp"
+#include "raul/log.hpp"
+
+#include "AudioBuffer.hpp"
+#include "Driver.hpp"
+#include "Engine.hpp"
+#include "PatchImpl.hpp"
+#include "PostProcessor.hpp"
+#include "ProcessContext.hpp"
+#include "QueuedEngineInterface.hpp"
+#include "ThreadManager.hpp"
/** Record of a patch in this Ingen LV2 bundle */
struct LV2Patch {
diff --git a/src/server/wscript b/src/server/wscript
index 9b486d25..92404c5c 100644
--- a/src/server/wscript
+++ b/src/server/wscript
@@ -58,7 +58,7 @@ def build(bld):
obj = bld(features = 'cxx cxxshlib',
source = core_source,
export_includes = ['../../include'],
- includes = ['.', '..', '../..', '../../include'],
+ includes = ['.', '../..', '../../include'],
name = 'libingen_server',
target = 'ingen_server',
install_path = '${LIBDIR}',
@@ -71,7 +71,7 @@ def build(bld):
source = '''HTTPClientSender.cpp
HTTPEngineReceiver.cpp
ingen_http.cpp''',
- includes = ['.', '..', '../..', '../../include'],
+ includes = ['.', '../..', '../../include'],
name = 'libingen_http',
target = 'ingen_http',
install_path = '${LIBDIR}',
@@ -83,7 +83,7 @@ def build(bld):
source = '''OSCClientSender.cpp
OSCEngineReceiver.cpp
ingen_osc.cpp''',
- includes = ['.', '..', '../..', '../../include'],
+ includes = ['.', '../..', '../../include'],
name = 'libingen_osc',
target = 'ingen_osc',
install_path = '${LIBDIR}',
@@ -93,7 +93,7 @@ def build(bld):
if bld.is_defined('HAVE_JACK'):
obj = bld(features = 'cxx cxxshlib',
source = 'JackDriver.cpp ingen_jack.cpp',
- includes = ['.', '..', '../..', '../../include'],
+ includes = ['.', '../..', '../../include'],
name = 'libingen_jack',
target = 'ingen_jack',
install_path = '${LIBDIR}',
@@ -103,7 +103,7 @@ def build(bld):
# Ingen LV2 wrapper
obj = bld(features = 'cxx cxxshlib',
source = ' ingen_lv2.cpp ',
- includes = ['.', '..', '../..', '../../include'],
+ includes = ['.', '../..', '../../include'],
name = 'libingen_lv2',
target = 'ingen_lv2',
#install_path = '${LIBDIR}',