summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-07-07 19:21:04 +0000
committerDavid Robillard <d@drobilla.net>2011-07-07 19:21:04 +0000
commit6fea56263f4cc8c3d74590249d2fe4383cf9c7cc (patch)
treecb2833973c50868809bbf0a22d7c0d43a4cdf4df
parentbce946fd0a645e42c91929494cf0c4b66b1e4cd9 (diff)
downloadingen-6fea56263f4cc8c3d74590249d2fe4383cf9c7cc.tar.gz
ingen-6fea56263f4cc8c3d74590249d2fe4383cf9c7cc.tar.bz2
ingen-6fea56263f4cc8c3d74590249d2fe4383cf9c7cc.zip
Upgrade to waf 1.6.6
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3418 a436a847-0d15-0410-975c-d299462d15a1
-rwxr-xr-xwafbin87638 -> 88585 bytes
-rw-r--r--wscript18
2 files changed, 10 insertions, 8 deletions
diff --git a/waf b/waf
index 686fe2ba..ef338a35 100755
--- a/waf
+++ b/waf
Binary files differ
diff --git a/wscript b/wscript
index e128ad62..f778587e 100644
--- a/wscript
+++ b/wscript
@@ -17,6 +17,7 @@ out = 'build'
def options(opt):
autowaf.set_options(opt)
+ opt.load('compiler_cxx')
opt.add_option('--data-dir', type='string', dest='datadir',
help="Ingen data install directory [Default: PREFIX/share/ingen]")
opt.add_option('--module-dir', type='string', dest='moduledir',
@@ -38,6 +39,7 @@ def options(opt):
def configure(conf):
autowaf.configure(conf)
conf.line_just = 67
+
autowaf.display_header('Ingen Configuration')
conf.load('compiler_cxx')
autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM',
@@ -79,14 +81,14 @@ def configure(conf):
define_name='HAVE_POSIX_MEMALIGN',
mandatory=False)
- autowaf.check_header(conf, 'lv2/lv2plug.in/ns/lv2core/lv2.h')
- autowaf.check_header(conf, 'lv2/lv2plug.in/ns/ext/atom/atom.h')
- autowaf.check_header(conf, 'lv2/lv2plug.in/ns/ext/contexts/contexts.h')
- autowaf.check_header(conf, 'lv2/lv2plug.in/ns/ext/event/event-helpers.h')
- autowaf.check_header(conf, 'lv2/lv2plug.in/ns/ext/event/event.h')
- autowaf.check_header(conf, 'lv2/lv2plug.in/ns/ext/resize-port/resize-port.h')
- autowaf.check_header(conf, 'lv2/lv2plug.in/ns/ext/uri-map/uri-map.h')
- autowaf.check_header(conf, 'lv2/lv2plug.in/ns/ext/uri-unmap/uri-unmap.h')
+ autowaf.check_header(conf, 'c', 'lv2/lv2plug.in/ns/lv2core/lv2.h')
+ autowaf.check_header(conf, 'c', 'lv2/lv2plug.in/ns/ext/atom/atom.h')
+ autowaf.check_header(conf, 'c', 'lv2/lv2plug.in/ns/ext/contexts/contexts.h')
+ autowaf.check_header(conf, 'c', 'lv2/lv2plug.in/ns/ext/event/event-helpers.h')
+ autowaf.check_header(conf, 'c', 'lv2/lv2plug.in/ns/ext/event/event.h')
+ autowaf.check_header(conf, 'c', 'lv2/lv2plug.in/ns/ext/resize-port/resize-port.h')
+ autowaf.check_header(conf, 'c', 'lv2/lv2plug.in/ns/ext/uri-map/uri-map.h')
+ autowaf.check_header(conf, 'c', 'lv2/lv2plug.in/ns/ext/uri-unmap/uri-unmap.h')
autowaf.define(conf, 'INGEN_VERSION', INGEN_VERSION)