From 1c54807896b84be490f93b9a7ee546204517af6f Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 27 Feb 2017 20:30:20 +0100 Subject: Update waf and fix C++11 flags --- wscript | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 9455c70..19f51bb 100644 --- a/wscript +++ b/wscript @@ -47,11 +47,9 @@ def configure(conf): conf.load('compiler_c') conf.load('compiler_cxx') autowaf.configure(conf) - autowaf.set_c99_mode(conf) autowaf.display_header('Jalv Configuration') - - if conf.check_cxx(cxxflags=["-std=c++0x"]): - conf.env.append_unique('CXXFLAGS', ['-std=c++0x']) # for Gtkmm + autowaf.set_c99_mode(conf) + autowaf.set_cxx11_mode(conf) autowaf.check_pkg(conf, 'lv2', atleast_version='1.14.0', uselib_store='LV2') autowaf.check_pkg(conf, 'lilv-0', uselib_store='LILV', @@ -234,7 +232,7 @@ def build(bld): includes = ['.', 'src'], lib = ['pthread'], install_path = '${BINDIR}', - cxxflags = ['-fPIC', '-std=c++11']) + cxxflags = ['-fPIC']) autowaf.use_lib(bld, obj, libs + ' QT5') # Man pages -- cgit v1.2.1