From 484b33f1a82c590be32f8ed12e4bf07a5af249cd Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 18 Dec 2014 08:01:59 +0000 Subject: Upgrade to waf 1.8.5. git-svn-id: http://svn.drobilla.net/lad/trunk/machina@5496 a436a847-0d15-0410-975c-d299462d15a1 --- waf | Bin 97411 -> 100567 bytes wscript | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/waf b/waf index a59c289..faf9dde 100755 Binary files a/waf and b/waf differ diff --git a/wscript b/wscript index f2b5825..015f0f6 100644 --- a/wscript +++ b/wscript @@ -55,7 +55,7 @@ def configure(conf): define_name='HAVE_POSIX_MEMALIGN', mandatory=False) - if conf.is_defined('HAVE_GTKMM') and conf.is_defined('HAVE_GANV'): + if conf.env.HAVE_GTKMM and conf.env.HAVE_GANV: autowaf.define(conf, 'MACHINA_BUILD_GUI', 1) autowaf.define(conf, 'MACHINA_PPQN', 19200) @@ -65,15 +65,15 @@ def configure(conf): conf.write_config_header('machina_config.h', remove=False) - autowaf.display_msg(conf, "Jack", conf.is_defined('HAVE_JACK')) - autowaf.display_msg(conf, "GUI", conf.is_defined('MACHINA_BUILD_GUI')) + autowaf.display_msg(conf, "Jack", bool(conf.env.HAVE_JACK)) + autowaf.display_msg(conf, "GUI", bool(conf.env.MACHINA_BUILD_GUI)) print('') def build(bld): bld.recurse('src/engine') bld.recurse('src/client') - if bld.is_defined('MACHINA_BUILD_GUI'): + if bld.env.MACHINA_BUILD_GUI: bld.recurse('src/gui') def lint(ctx): -- cgit v1.2.1