summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-12-22 01:21:50 +0000
committerDavid Robillard <d@drobilla.net>2008-12-22 01:21:50 +0000
commit184c68d99e9ff9a7beba4927c770b0192e9dfce7 (patch)
treed29228e485e0b9df8a076bc728e71b85158495dd
parent35e0a71bb04d435e858c9b1cbd087c63c3d5e781 (diff)
downloadingen-184c68d99e9ff9a7beba4927c770b0192e9dfce7.tar.gz
ingen-184c68d99e9ff9a7beba4927c770b0192e9dfce7.tar.bz2
ingen-184c68d99e9ff9a7beba4927c770b0192e9dfce7.zip
Fix header/function checks.
Fix LV2core include path. Don't write python style boolean literals to wafconfig.h. Upgrade to waf 1.5.2. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1898 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--wscript8
1 files changed, 4 insertions, 4 deletions
diff --git a/wscript b/wscript
index 6ee5de4d..162abc15 100644
--- a/wscript
+++ b/wscript
@@ -50,8 +50,8 @@ def configure(conf):
build_gui = conf.env['HAVE_GLADEMM'] == 1 and conf.env['HAVE_FLOWCANVAS'] == 1
conf.define('INGEN_VERSION', INGEN_VERSION)
- conf.define('BUILD_GUI', build_gui)
- conf.define('HAVE_JACK_MIDI', conf.env['HAVE_JACK'] == 1)
+ conf.define('BUILD_INGEN_GUI', int(build_gui))
+ conf.define('HAVE_JACK_MIDI', int(conf.env['HAVE_JACK'] == 1))
if conf.env['BUNDLE']:
conf.define('INGEN_DATA_DIR', os.path.normpath(
conf.env['DATADIRNAME'] + 'ingen'))
@@ -72,7 +72,7 @@ def configure(conf):
autowaf.display_msg(conf, "HTTP", str(conf.env['HAVE_SOUP'] == 1))
autowaf.display_msg(conf, "LV2", str(conf.env['HAVE_SLV2'] == 1))
autowaf.display_msg(conf, "LADSPA", str(conf.env['HAVE_LADSPA_H'] == 1))
- autowaf.display_msg(conf, "Build GUI", str(conf.env['BUILD_GUI'] == 1))
+ autowaf.display_msg(conf, "GUI", str(conf.env['BUILD_INGEN_GUI'] == 1))
print
def build(bld):
@@ -87,7 +87,7 @@ def build(bld):
bld.add_subdirs('src/shared')
bld.add_subdirs('src/client')
- if bld.env['BUILD_GUI']:
+ if bld.env['BUILD_INGEN_GUI']:
bld.add_subdirs('src/gui')
# Program