diff options
| author | David Robillard <d@drobilla.net> | 2010-12-16 21:39:53 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2010-12-16 21:39:53 +0000 |
| commit | 9d2fa5d832e299d7708bedabb448174b7b3495a9 (patch) | |
| tree | 84e1d14d8ce15b758b947a7ac4edfdc96d1bd096 | |
| parent | e0a43e0b891e02529aab179d82d9181a0bb55780 (diff) | |
| download | machina-9d2fa5d832e299d7708bedabb448174b7b3495a9.tar.gz machina-9d2fa5d832e299d7708bedabb448174b7b3495a9.tar.bz2 machina-9d2fa5d832e299d7708bedabb448174b7b3495a9.zip | |
Fix use of conf.define and subsequent check in conf.env (no longer works with waf 1.6) (fix ticket #610).
git-svn-id: http://svn.drobilla.net/lad/trunk/machina@2724 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | wscript | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -47,14 +47,14 @@ def configure(conf): build_gui = conf.env['HAVE_GLADEMM'] == 1 and conf.env['HAVE_FLOWCANVAS'] == 1 - conf.define('MACHINA_PPQN', 19200) + autowaf.define(conf, 'MACHINA_PPQN', 19200) - conf.define('MACHINA_VERSION', MACHINA_VERSION) - conf.define('BUILD_MACHINA_GUI', int(build_gui)) + autowaf.define(conf, 'MACHINA_VERSION', MACHINA_VERSION) + autowaf.define(conf, 'BUILD_MACHINA_GUI', int(build_gui)) if conf.env['BUNDLE']: - conf.define('MACHINA_DATA_DIR', os.path.join(conf.env['DATADIRNAME'] + 'machina')) + autowaf.define(conf, 'MACHINA_DATA_DIR', os.path.join(conf.env['DATADIRNAME'] + 'machina')) else: - conf.define('MACHINA_DATA_DIR', os.path.join(conf.env['DATADIR'], 'machina')) + autowaf.define(conf, 'MACHINA_DATA_DIR', os.path.join(conf.env['DATADIR'], 'machina')) conf.write_config_header('machina-config.h', remove=False) |