summaryrefslogtreecommitdiffstats
path: root/wscript
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2014-12-18 08:01:59 +0000
committerDavid Robillard <d@drobilla.net>2014-12-18 08:01:59 +0000
commitd1252e8dbc8163b18ffc5244b4f67950e23a9264 (patch)
tree46117b6d7b367c90217d4966a5e1fb448a0169d0 /wscript
parente89a43a5f8f513610e9a1fd9aa3221c7a0e1ae2b (diff)
downloadingen-d1252e8dbc8163b18ffc5244b4f67950e23a9264.tar.gz
ingen-d1252e8dbc8163b18ffc5244b4f67950e23a9264.tar.bz2
ingen-d1252e8dbc8163b18ffc5244b4f67950e23a9264.zip
Upgrade to waf 1.8.5.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5496 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'wscript')
-rw-r--r--wscript18
1 files changed, 9 insertions, 9 deletions
diff --git a/wscript b/wscript
index 82650d55..9fa2b694 100644
--- a/wscript
+++ b/wscript
@@ -103,7 +103,7 @@ def configure(conf):
define_name='HAVE_GCOV',
mandatory=False)
- if conf.is_defined('HAVE_GCOV'):
+ if conf.is_defiend('HAVE_GCOV'):
conf.env.INGEN_TEST_LIBS = ['gcov']
conf.env.INGEN_TEST_CXXFLAGS = ['-fprofile-arcs', '-ftest-coverage']
else:
@@ -118,10 +118,10 @@ def configure(conf):
autowaf.define(conf, 'INGEN_VERSION', INGEN_VERSION)
- if not Options.options.no_gui and conf.is_defined('HAVE_GANV'):
+ if not Options.options.no_gui and conf.env.HAVE_GANV:
autowaf.define(conf, 'INGEN_BUILD_GUI', 1)
- if conf.is_defined('HAVE_JACK'):
+ if conf.env.HAVE_JACK:
autowaf.define(conf, 'HAVE_JACK_MIDI', 1)
autowaf.define(conf, 'INGEN_DATA_DIR',
@@ -133,17 +133,17 @@ def configure(conf):
conf.write_config_header('ingen_config.h', remove=False)
- autowaf.display_msg(conf, "Jack", conf.is_defined('HAVE_JACK'))
+ autowaf.display_msg(conf, "Jack", bool(conf.env.HAVE_JACK))
autowaf.display_msg(conf, "Jack session support",
- conf.is_defined('INGEN_JACK_SESSION'))
+ bool(conf.env.INGEN_JACK_SESSION))
autowaf.display_msg(conf, "Jack metadata support",
conf.is_defined('HAVE_JACK_METADATA'))
autowaf.display_msg(conf, "Socket interface", conf.is_defined('HAVE_SOCKET'))
- autowaf.display_msg(conf, "LV2", conf.is_defined('HAVE_LILV'))
- autowaf.display_msg(conf, "GUI", str(conf.env.INGEN_BUILD_GUI == 1))
+ autowaf.display_msg(conf, "LV2", bool(conf.env.HAVE_LILV))
+ autowaf.display_msg(conf, "GUI", bool(conf.env.INGEN_BUILD_GUI))
autowaf.display_msg(conf, "LV2 bundle", conf.env.INGEN_BUNDLE_DIR)
autowaf.display_msg(conf, "HTML plugin documentation support",
- conf.is_defined('HAVE_WEBKIT'))
+ bool(conf.env.HAVE_WEBKIT))
print('')
def build(bld):
@@ -167,7 +167,7 @@ def build(bld):
bld.recurse('src/client')
bld.recurse('src/socket')
- if bld.is_defined('INGEN_BUILD_GUI'):
+ if bld.env.INGEN_BUILD_GUI:
bld.recurse('src/gui')
# Program