summaryrefslogtreecommitdiffstats
path: root/src/shared
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2009-05-03 17:39:16 +0000
committerDavid Robillard <d@drobilla.net>2009-05-03 17:39:16 +0000
commit6012222c80c37be78db3f38a37f7d9a609a213a8 (patch)
treee67148bd53071ffe7172923430b60486bce28760 /src/shared
parentdb6c699017528e6f7c3958b67422e6a936a92e73 (diff)
downloadingen-6012222c80c37be78db3f38a37f7d9a609a213a8.tar.gz
ingen-6012222c80c37be78db3f38a37f7d9a609a213a8.tar.bz2
ingen-6012222c80c37be78db3f38a37f7d9a609a213a8.zip
Update waf configuration header for new waf scheme (in 1.5.6).
Split low-level LV2 event buffer into separate class from EventBuffer (for reuse). git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1958 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/LV2Features.hpp2
-rw-r--r--src/shared/LV2URIMap.hpp2
-rw-r--r--src/shared/runtime_paths.cpp8
-rw-r--r--src/shared/runtime_paths.hpp4
-rw-r--r--src/shared/wscript2
5 files changed, 8 insertions, 10 deletions
diff --git a/src/shared/LV2Features.hpp b/src/shared/LV2Features.hpp
index d4933d09..3ffbe520 100644
--- a/src/shared/LV2Features.hpp
+++ b/src/shared/LV2Features.hpp
@@ -18,7 +18,7 @@
#ifndef LV2FEATURES_HPP
#define LV2FEATURES_HPP
-#include "wafconfig.h"
+#include "ingen-config.h"
#ifndef HAVE_SLV2
#error "This file requires SLV2, but HAVE_SLV2 is not defined. Please report."
#endif
diff --git a/src/shared/LV2URIMap.hpp b/src/shared/LV2URIMap.hpp
index 333d22e9..7da53a09 100644
--- a/src/shared/LV2URIMap.hpp
+++ b/src/shared/LV2URIMap.hpp
@@ -18,7 +18,7 @@
#ifndef LV2URIMAP_HPP
#define LV2URIMAP_HPP
-#include "wafconfig.h"
+#include "ingen-config.h"
#ifndef HAVE_SLV2
#error "This file requires SLV2, but HAVE_SLV2 is not defined. Please report."
#endif
diff --git a/src/shared/runtime_paths.cpp b/src/shared/runtime_paths.cpp
index e2641b9c..15bafa50 100644
--- a/src/shared/runtime_paths.cpp
+++ b/src/shared/runtime_paths.cpp
@@ -15,10 +15,12 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <iostream>
-#include "wafconfig.h"
-#include "runtime_paths.hpp"
+#include <dlfcn.h>
+#include <limits.h>
+#include <stdlib.h>
#include <glibmm/module.h>
+#include "ingen-config.h"
+#include "runtime_paths.hpp"
using namespace std;
diff --git a/src/shared/runtime_paths.hpp b/src/shared/runtime_paths.hpp
index 8081a249..5ee1aebc 100644
--- a/src/shared/runtime_paths.hpp
+++ b/src/shared/runtime_paths.hpp
@@ -22,10 +22,6 @@
#define _GNU_SOURCE
#endif
-#include <dlfcn.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
#include <string>
namespace Ingen {
diff --git a/src/shared/wscript b/src/shared/wscript
index 83b3e7c1..50fb7320 100644
--- a/src/shared/wscript
+++ b/src/shared/wscript
@@ -18,7 +18,7 @@ def build(bld):
autowaf.use_lib(bld, obj, 'SOUP')
obj.source += ' HTTPSender.cpp '
obj.export_incdirs = ['.']
- obj.includes = ['.', '../', '../common']
+ obj.includes = ['.', '..', '../..', '../common']
obj.name = 'libingen_shared'
obj.target = 'ingen_shared'
obj.vnum = '0.0.0'