summaryrefslogtreecommitdiffstats
path: root/wscript
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
commit263a04e696533a181d44394a459496dc33125d86 (patch)
treebe44696ad1e6129e2d74b0f91f3f3111c8593d44 /wscript
parent843b5756630dc4baf85622fd5ae4bbaf078f3424 (diff)
downloadraul-263a04e696533a181d44394a459496dc33125d86.tar.gz
raul-263a04e696533a181d44394a459496dc33125d86.tar.bz2
raul-263a04e696533a181d44394a459496dc33125d86.zip
Upgrade to waf 1.6.6
git-svn-id: http://svn.drobilla.net/lad/trunk/raul@3418 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'wscript')
-rw-r--r--wscript7
1 files changed, 4 insertions, 3 deletions
diff --git a/wscript b/wscript
index 9a466d4..b243a3f 100644
--- a/wscript
+++ b/wscript
@@ -36,6 +36,7 @@ out = 'build'
def options(opt):
autowaf.set_options(opt)
+ opt.load('compiler_cxx')
opt.add_option('--test', action='store_true', default=False, dest='build_tests',
help="Build unit tests")
opt.add_option('--log-colour', action='store_true', default=True, dest='log_colour',
@@ -69,11 +70,11 @@ def configure(conf):
if Options.options.cpp0x:
conf.env.append_value('CXXFLAGS', [ '-std=c++0x' ])
- autowaf.check_header(conf, 'memory')
+ autowaf.check_header(conf, 'cxx', 'memory')
autowaf.define(conf, 'RAUL_CPP0x', 1)
else:
- autowaf.check_header(conf, 'boost/shared_ptr.hpp')
- autowaf.check_header(conf, 'boost/weak_ptr.hpp')
+ autowaf.check_header(conf, 'cxx', 'boost/shared_ptr.hpp')
+ autowaf.check_header(conf, 'cxx', 'boost/weak_ptr.hpp')
conf.write_config_header('raul-config.h', remove=False)