aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2019-10-17 13:03:02 +0200
committerDavid Robillard <d@drobilla.net>2019-10-17 13:03:02 +0200
commit69623bbe00a9d186f8fdb8921b70acadf8ba6465 (patch)
treeba35c7209302660845d42d638095d0e262aff774
parent78d0b5abe0f498ce413f54c2e9adcc2af1dc1e7d (diff)
downloadingen-69623bbe00a9d186f8fdb8921b70acadf8ba6465.tar.gz
ingen-69623bbe00a9d186f8fdb8921b70acadf8ba6465.tar.bz2
ingen-69623bbe00a9d186f8fdb8921b70acadf8ba6465.zip
Remove use of autowaf.define
-rw-r--r--src/gui/wscript4
-rw-r--r--wscript23
2 files changed, 11 insertions, 16 deletions
diff --git a/src/gui/wscript b/src/gui/wscript
index c34731ba..ba0026ef 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -22,10 +22,10 @@ def configure(conf):
atleast_version='1.4.0', system=True, mandatory=False)
if conf.env.HAVE_GANV and conf.env.HAVE_GTKMM:
- autowaf.define(conf, 'INGEN_BUILD_GUI', 1)
+ conf.env.INGEN_BUILD_GUI = 1
if Options.options.light_theme:
- autowaf.define(conf, 'INGEN_USE_LIGHT_THEME', 1)
+ conf.define('INGEN_USE_LIGHT_THEME', 1)
def build(bld):
obj = bld(features = 'cxx cxxshlib',
diff --git a/wscript b/wscript
index 43440488..a21c4a6b 100644
--- a/wscript
+++ b/wscript
@@ -114,7 +114,7 @@ def configure(conf):
conf.check_python_version((2,4,0), mandatory=False)
if not Options.options.no_plugin:
- autowaf.define(conf, 'INGEN_BUILD_LV2', 1)
+ conf.env.INGEN_BUILD_LV2 = 1
if not Options.options.no_jack:
autowaf.check_pkg(conf, 'jack', uselib_store='JACK',
@@ -130,10 +130,10 @@ def configure(conf):
uselib = 'JACK',
mandatory = False)
if not Options.options.no_jack_session:
- autowaf.define(conf, 'INGEN_JACK_SESSION', 1)
+ conf.define('INGEN_JACK_SESSION', 1)
if Options.options.debug_urids:
- autowaf.define(conf, 'INGEN_DEBUG_URIDS', 1)
+ conf.define('INGEN_DEBUG_URIDS', 1)
conf.env.INGEN_TEST_LINKFLAGS = []
conf.env.INGEN_TEST_CXXFLAGS = []
@@ -156,23 +156,18 @@ def configure(conf):
conf.define('INGEN_VERSION', INGEN_VERSION)
if conf.env.HAVE_SIGCPP and not Options.options.no_client:
- autowaf.define(conf, 'INGEN_BUILD_CLIENT', 1)
+ conf.env.INGEN_BUILD_CLIENT = 1
else:
Options.options.no_gui = True
if not Options.options.no_gui:
conf.recurse('src/gui')
- if conf.env.HAVE_JACK:
- autowaf.define(conf, 'HAVE_JACK_MIDI', 1)
+ conf.env.INGEN_MAJOR_VERSION = INGEN_MAJOR_VERSION
- autowaf.define(conf, 'INGEN_MAJOR_VERSION', INGEN_MAJOR_VERSION)
- autowaf.define(conf, 'INGEN_DATA_DIR',
- os.path.join(conf.env.DATADIR, 'ingen'))
- autowaf.define(conf, 'INGEN_MODULE_DIR',
- conf.env.LIBDIR)
- autowaf.define(conf, 'INGEN_BUNDLE_DIR',
- os.path.join(conf.env.LV2DIR, 'ingen.lv2'))
+ conf.define('INGEN_DATA_DIR', os.path.join(conf.env.DATADIR, 'ingen'))
+ conf.define('INGEN_MODULE_DIR', conf.env.LIBDIR)
+ conf.define('INGEN_BUNDLE_DIR', os.path.join(conf.env.LV2DIR, 'ingen.lv2'))
autowaf.set_lib_env(conf, 'ingen', INGEN_VERSION)
conf.run_env.append_unique('XDG_DATA_DIRS', [str(conf.path.get_bld())])
@@ -189,7 +184,7 @@ def configure(conf):
'HTML plugin doc support': bool(conf.env.HAVE_WEBKIT),
'PortAudio driver': bool(conf.env.HAVE_PORTAUDIO),
'Jack driver': bool(conf.env.HAVE_JACK),
- 'Jack session support': bool(conf.env.INGEN_JACK_SESSION),
+ 'Jack session support': conf.is_defined('INGEN_JACK_SESSION'),
'Jack metadata support': conf.is_defined('HAVE_JACK_METADATA'),
'LV2 plugin driver': bool(conf.env.INGEN_BUILD_LV2),
'LV2 bundle': conf.env.INGEN_BUNDLE_DIR,