summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2009-07-05 04:24:48 +0000
committerDavid Robillard <d@drobilla.net>2009-07-05 04:24:48 +0000
commit2a94b51f45c7e79c7f9871e0877087d2a1ac7cbe (patch)
tree6acc5677e076de11f730d166714a08d1fd3c3e37
parentb8cdfe9d97b8b5b8f0de3732a9f3075476df8071 (diff)
downloadlilv-2a94b51f45c7e79c7f9871e0877087d2a1ac7cbe.tar.gz
lilv-2a94b51f45c7e79c7f9871e0877087d2a1ac7cbe.tar.bz2
lilv-2a94b51f45c7e79c7f9871e0877087d2a1ac7cbe.zip
Use 'standard' bundle paths for #include directives.
git-svn-id: http://svn.drobilla.net/lad/trunk/slv2@2155 a436a847-0d15-0410-975c-d299462d15a1
l---------hosts/event.lv21
l---------hosts/lv2_event.h1
l---------hosts/lv2_event_helpers.h1
-rw-r--r--hosts/lv2_jack_host.c6
-rw-r--r--hosts/lv2_uri_map.h1
l---------hosts/uri-map.lv21
l---------utils/event.lv21
l---------utils/uri-map.lv21
-rw-r--r--wscript4
9 files changed, 9 insertions, 8 deletions
diff --git a/hosts/event.lv2 b/hosts/event.lv2
new file mode 120000
index 0000000..5e8f78b
--- /dev/null
+++ b/hosts/event.lv2
@@ -0,0 +1 @@
+../../lv2/ext/event.lv2 \ No newline at end of file
diff --git a/hosts/lv2_event.h b/hosts/lv2_event.h
deleted file mode 120000
index 9deea12..0000000
--- a/hosts/lv2_event.h
+++ /dev/null
@@ -1 +0,0 @@
-../../lv2/ext/event/lv2_event.h \ No newline at end of file
diff --git a/hosts/lv2_event_helpers.h b/hosts/lv2_event_helpers.h
deleted file mode 120000
index 846659f..0000000
--- a/hosts/lv2_event_helpers.h
+++ /dev/null
@@ -1 +0,0 @@
-../../lv2/ext/event/lv2_event_helpers.h \ No newline at end of file
diff --git a/hosts/lv2_jack_host.c b/hosts/lv2_jack_host.c
index ebeb96b..438421f 100644
--- a/hosts/lv2_jack_host.c
+++ b/hosts/lv2_jack_host.c
@@ -26,9 +26,9 @@
#include <jack/jack.h>
#include <jack/midiport.h>
#include "slv2/slv2.h"
-#include "lv2_uri_map.h"
-#include "lv2_event.h"
-#include "lv2_event_helpers.h"
+#include "uri-map.lv2/uri-map.h"
+#include "event.lv2/event.h"
+#include "event.lv2/event-helpers.h"
#include "jack_compat.h"
#define MIDI_BUFFER_SIZE 1024
diff --git a/hosts/lv2_uri_map.h b/hosts/lv2_uri_map.h
deleted file mode 100644
index 7448585..0000000
--- a/hosts/lv2_uri_map.h
+++ /dev/null
@@ -1 +0,0 @@
-link ../../lv2/ext/uri-map/lv2_uri_map.h \ No newline at end of file
diff --git a/hosts/uri-map.lv2 b/hosts/uri-map.lv2
new file mode 120000
index 0000000..0c13eb8
--- /dev/null
+++ b/hosts/uri-map.lv2
@@ -0,0 +1 @@
+../../lv2/ext/uri-map.lv2 \ No newline at end of file
diff --git a/utils/event.lv2 b/utils/event.lv2
new file mode 120000
index 0000000..5e8f78b
--- /dev/null
+++ b/utils/event.lv2
@@ -0,0 +1 @@
+../../lv2/ext/event.lv2 \ No newline at end of file
diff --git a/utils/uri-map.lv2 b/utils/uri-map.lv2
new file mode 120000
index 0000000..0c13eb8
--- /dev/null
+++ b/utils/uri-map.lv2
@@ -0,0 +1 @@
+../../lv2/ext/uri-map.lv2 \ No newline at end of file
diff --git a/wscript b/wscript
index 1506ae3..8b7bfc5 100644
--- a/wscript
+++ b/wscript
@@ -120,7 +120,7 @@ def build(bld):
for i in utils.split():
obj = bld.new_task_gen('cc', 'program')
obj.source = i + '.c'
- obj.includes = ['.', './src']
+ obj.includes = ['.', './src', './utils']
obj.uselib_local = 'libslv2'
obj.target = i
obj.install_path = '${BINDIR}'
@@ -133,7 +133,7 @@ def build(bld):
for i in hosts.split():
obj = bld.new_task_gen('cc', 'program')
obj.source = i + '.c'
- obj.includes = ['.', './src']
+ obj.includes = ['.', './src', './utils']
obj.uselib = 'JACK'
obj.uselib_local = 'libslv2'
obj.target = i