summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/client/wscript2
-rw-r--r--src/engine/Engine.cpp4
-rw-r--r--src/engine/Makefile.am2
-rw-r--r--src/engine/MidiControlNode.cpp2
-rw-r--r--src/engine/PortImpl.cpp2
-rw-r--r--src/engine/events.hpp56
l---------src/engine/lv2_contexts.h2
-rw-r--r--src/engine/wscript2
-rw-r--r--src/gui/wscript2
-rw-r--r--src/ingen/Makefile.am6
-rw-r--r--src/ingen/wscript2
-rw-r--r--src/module/wscript2
-rw-r--r--src/serialisation/wscript2
-rw-r--r--src/shared/wscript2
14 files changed, 43 insertions, 45 deletions
diff --git a/src/client/wscript b/src/client/wscript
index 6b4408a7..c4b355c3 100644
--- a/src/client/wscript
+++ b/src/client/wscript
@@ -27,7 +27,7 @@ def build(bld):
if bld.env()['HAVE_LIBLO']:
obj.source += ' OSCClientReceiver.cpp OSCEngineSender.cpp '
- obj.includes = ['..', '../../common', '../..']
+ obj.includes = ['..', '../common']
obj.name = 'libingen_client'
obj.target = 'ingen_client'
obj.uselib = 'GLIBMM SLV2 RAUL REDLANDMM SOUP XML2 SIGCPP'
diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp
index a08a37ca..64a2431c 100644
--- a/src/engine/Engine.cpp
+++ b/src/engine/Engine.cpp
@@ -37,8 +37,8 @@
#include "OSCDriver.hpp"
#include "QueuedEventSource.hpp"
#include "PostProcessor.hpp"
-#include "CreatePatchEvent.hpp"
-#include "EnablePatchEvent.hpp"
+#include "events/CreatePatchEvent.hpp"
+#include "events/EnablePatchEvent.hpp"
#include "OSCEngineReceiver.hpp"
#ifdef HAVE_SOUP
#include "HTTPEngineReceiver.hpp"
diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
index 3c464de3..ca76dfc5 100644
--- a/src/engine/Makefile.am
+++ b/src/engine/Makefile.am
@@ -27,8 +27,6 @@ libingen_engine_la_LIBADD = \
@SLV2_LIBS@ \
@SOUP_LIBS@
-AM_CFLAGS=-std=c99
-
libingen_engine_la_SOURCES = \
AudioBuffer.cpp \
AudioBuffer.hpp \
diff --git a/src/engine/MidiControlNode.cpp b/src/engine/MidiControlNode.cpp
index bfe0e57e..0aeac448 100644
--- a/src/engine/MidiControlNode.cpp
+++ b/src/engine/MidiControlNode.cpp
@@ -19,7 +19,7 @@
#include <raul/midi_events.h>
#include "MidiControlNode.hpp"
#include "PostProcessor.hpp"
-#include "MidiLearnEvent.hpp"
+#include "events/MidiLearnEvent.hpp"
#include "InputPort.hpp"
#include "OutputPort.hpp"
#include "InternalPlugin.hpp"
diff --git a/src/engine/PortImpl.cpp b/src/engine/PortImpl.cpp
index 3eac65ca..62e89def 100644
--- a/src/engine/PortImpl.cpp
+++ b/src/engine/PortImpl.cpp
@@ -24,7 +24,7 @@
#include "AudioBuffer.hpp"
#include "EventBuffer.hpp"
#include "ProcessContext.hpp"
-#include "SendPortActivityEvent.hpp"
+#include "events/SendPortActivityEvent.hpp"
using namespace std;
diff --git a/src/engine/events.hpp b/src/engine/events.hpp
index 14f5230c..6131cb76 100644
--- a/src/engine/events.hpp
+++ b/src/engine/events.hpp
@@ -20,34 +20,34 @@
#include CONFIG_H_PATH
-#include "AllNotesOffEvent.hpp"
-#include "ClearPatchEvent.hpp"
-#include "ConnectionEvent.hpp"
-#include "CreateNodeEvent.hpp"
-#include "CreatePatchEvent.hpp"
-#include "CreatePortEvent.hpp"
-#include "DeactivateEvent.hpp"
-#include "DestroyEvent.hpp"
-#include "DisconnectAllEvent.hpp"
-#include "DisconnectionEvent.hpp"
-#include "EnablePatchEvent.hpp"
-#include "LoadPluginsEvent.hpp"
-#include "MidiLearnEvent.hpp"
-#include "NoteEvent.hpp"
-#include "PingQueuedEvent.hpp"
-#include "RegisterClientEvent.hpp"
-#include "RenameEvent.hpp"
-#include "RequestAllObjectsEvent.hpp"
-#include "RequestMetadataEvent.hpp"
-#include "RequestObjectEvent.hpp"
-#include "RequestPluginEvent.hpp"
-#include "RequestPluginsEvent.hpp"
-#include "RequestPortValueEvent.hpp"
-#include "SetMetadataEvent.hpp"
-#include "SetPolyphonicEvent.hpp"
-#include "SetPolyphonyEvent.hpp"
-#include "SetPortValueEvent.hpp"
-#include "UnregisterClientEvent.hpp"
+#include "events/AllNotesOffEvent.hpp"
+#include "events/ClearPatchEvent.hpp"
+#include "events/ConnectionEvent.hpp"
+#include "events/CreateNodeEvent.hpp"
+#include "events/CreatePatchEvent.hpp"
+#include "events/CreatePortEvent.hpp"
+#include "events/DeactivateEvent.hpp"
+#include "events/DestroyEvent.hpp"
+#include "events/DisconnectAllEvent.hpp"
+#include "events/DisconnectionEvent.hpp"
+#include "events/EnablePatchEvent.hpp"
+#include "events/LoadPluginsEvent.hpp"
+#include "events/MidiLearnEvent.hpp"
+#include "events/NoteEvent.hpp"
+#include "events/PingQueuedEvent.hpp"
+#include "events/RegisterClientEvent.hpp"
+#include "events/RenameEvent.hpp"
+#include "events/RequestAllObjectsEvent.hpp"
+#include "events/RequestMetadataEvent.hpp"
+#include "events/RequestObjectEvent.hpp"
+#include "events/RequestPluginEvent.hpp"
+#include "events/RequestPluginsEvent.hpp"
+#include "events/RequestPortValueEvent.hpp"
+#include "events/SetMetadataEvent.hpp"
+#include "events/SetPolyphonicEvent.hpp"
+#include "events/SetPolyphonyEvent.hpp"
+#include "events/SetPortValueEvent.hpp"
+#include "events/UnregisterClientEvent.hpp"
#endif // EVENTS_H
diff --git a/src/engine/lv2_contexts.h b/src/engine/lv2_contexts.h
index 8556a582..8c09603a 120000
--- a/src/engine/lv2_contexts.h
+++ b/src/engine/lv2_contexts.h
@@ -1 +1 @@
-../../../../lv2/lv2/contexts/lv2_contexts.h \ No newline at end of file
+../../../lv2/lv2/contexts/lv2_contexts.h \ No newline at end of file
diff --git a/src/engine/wscript b/src/engine/wscript
index 1ad135d3..2fbd6a23 100644
--- a/src/engine/wscript
+++ b/src/engine/wscript
@@ -65,7 +65,7 @@ def build(bld):
events/SetPortValueEvent.cpp
events/UnregisterClientEvent.cpp
'''
- obj.includes = ['..', '../../common', '../..', './events']
+ obj.includes = ['..', '../common', './events']
obj.name = 'libingen_engine'
obj.target = 'ingen_engine'
obj.uselib = 'GLIBMM GTHREAD SLV2 JACK LIBLO RAUL REDLANDMM SOUP'
diff --git a/src/gui/wscript b/src/gui/wscript
index 8895c7bc..f8ea297a 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -43,7 +43,7 @@ def build(bld):
dir = Params.g_options.moduledir or bld.env()['PREFIX'] + 'lib/ingen'
- obj.includes = ['..', '../../common', '../..']
+ obj.includes = ['..', '../common']
obj.defines = 'INGEN_DATA_DIR=\\\"' + dir + '\\\"'
obj.name = 'libingen_gui'
obj.target = 'ingen_gui'
diff --git a/src/ingen/Makefile.am b/src/ingen/Makefile.am
index c48a47a2..8422b9e0 100644
--- a/src/ingen/Makefile.am
+++ b/src/ingen/Makefile.am
@@ -14,15 +14,15 @@ dist_desktopfiles_DATA = ingen.desktop
bin_PROGRAMS = ingen
ingen_LDADD = \
- ../../libs/module/libingen_module.la \
- ../../libs/shared/libingen_shared.la \
+ ../module/libingen_module.la \
+ ../shared/libingen_shared.la \
@SLV2_LIBS@ \
@REDLANDMM_LIBS@ \
@RAUL_LIBS@ \
@GTHREAD_LIBS@ \
@GLIBMM_LIBS@
-ingen_DEPENDENCIES = ../../libs/module/libingen_module.la
+ingen_DEPENDENCIES = ../module/libingen_module.la
ingen_SOURCES = \
main.cpp \
diff --git a/src/ingen/wscript b/src/ingen/wscript
index d2e42c51..c876ff1b 100644
--- a/src/ingen/wscript
+++ b/src/ingen/wscript
@@ -4,7 +4,7 @@ def build(bld):
obj = bld.create_obj('cpp', 'program')
obj.target = 'ingen'
obj.source = 'main.cpp cmdline.c'
- obj.includes = ['.', '../../common', '../..', '../../libs']
+ obj.includes = ['../common', '../']
obj.defines = 'VERSION=\\\"' + bld.env()['INGEN_VERSION'] + '\\\"'
obj.uselib = 'GTHREAD GLIBMM REDLANDMM RAUL SLV2 INGEN LIBLO'
obj.uselib_local = 'libingen_module libingen_shared'
diff --git a/src/module/wscript b/src/module/wscript
index e202342d..fb9f9c93 100644
--- a/src/module/wscript
+++ b/src/module/wscript
@@ -8,7 +8,7 @@ def build(bld):
Module.cpp
global.cpp
'''
- obj.includes = ['..', '../../common', '../..']
+ obj.includes = ['..', '../common']
obj.defines = 'INGEN_MODULE_DIR=\\\"' + dir + '\\\"'
obj.name = 'libingen_module'
obj.target = 'ingen_module'
diff --git a/src/serialisation/wscript b/src/serialisation/wscript
index c3e98b81..4e67f3f9 100644
--- a/src/serialisation/wscript
+++ b/src/serialisation/wscript
@@ -8,7 +8,7 @@ def build(bld):
Serialiser.cpp
serialisation.cpp
'''
- obj.includes = ['..', '../../common', '../..']
+ obj.includes = ['..', '../common']
obj.name = 'libingen_serialisation'
obj.target = 'ingen_serialisation'
obj.uselib = 'GLIBMM SLV2 RAUL REDLANDMM'
diff --git a/src/shared/wscript b/src/shared/wscript
index 1974a827..3c7814a9 100644
--- a/src/shared/wscript
+++ b/src/shared/wscript
@@ -11,7 +11,7 @@ def build(bld):
OSCSender.cpp
Store.cpp
'''
- obj.includes = ['..', '../../common', '../..']
+ obj.includes = ['../', '../common']
obj.name = 'libingen_shared'
obj.target = 'ingen_shared'
obj.uselib = 'GLIBMM SLV2 RAUL REDLANDMM'
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-27 10:57:29 +0000