summaryrefslogtreecommitdiffstats
path: root/wscript
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-10-18 21:33:59 +0000
committerDavid Robillard <d@drobilla.net>2008-10-18 21:33:59 +0000
commit95620992d0006df880daad7f1699f699ea6aa562 (patch)
treeb358200241f14433d4908ac0d0439ff45fdc2605 /wscript
parent237512ade91a7073ce186d7b6c15ea4eb54e3e73 (diff)
downloadpatchage-95620992d0006df880daad7f1699f699ea6aa562.tar.gz
patchage-95620992d0006df880daad7f1699f699ea6aa562.tar.bz2
patchage-95620992d0006df880daad7f1699f699ea6aa562.zip
Lower glib/glibmm dependency to 2.14.
Fix optional parameters all over the palce because waf is retarded and sets failed check variables to ##some#stupid#name#like#this instead of false. Portability fixes (Ingen (except GUI) and all dependencies builds on OSX). git-svn-id: http://svn.drobilla.net/lad/trunk/patchage@1681 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'wscript')
-rw-r--r--wscript24
1 files changed, 12 insertions, 12 deletions
diff --git a/wscript b/wscript
index aa8c485..fd4467f 100644
--- a/wscript
+++ b/wscript
@@ -38,25 +38,25 @@ def configure(conf):
autowaf.check_pkg(conf, 'dbus-glib-1', destvar='DBUS_GLIB', mandatory=False)
autowaf.check_pkg(conf, 'flowcanvas', destvar='FLOWCANVAS', vnum='0.5.1', mandatory=True)
autowaf.check_pkg(conf, 'libglademm-2.4', destvar='GLADEMM', vnum='2.6.0', mandatory=True)
- autowaf.check_pkg(conf, 'glibmm-2.4', destvar='GLIBMM', vnum='2.16.0', mandatory=True)
+ autowaf.check_pkg(conf, 'glibmm-2.4', destvar='GLIBMM', vnum='2.14.0', mandatory=True)
autowaf.check_pkg(conf, 'libgnomecanvasmm-2.6', destvar='GNOMECANVASMM', mandatory=True)
- autowaf.check_pkg(conf, 'gthread-2.0', destvar='GTHREAD', vnum='2.16.0', mandatory=True)
+ autowaf.check_pkg(conf, 'gthread-2.0', destvar='GTHREAD', vnum='2.14.0', mandatory=True)
autowaf.check_pkg(conf, 'gtkmm-2.4', destvar='GTKMM', vnum='2.11.12', mandatory=True)
autowaf.check_pkg(conf, 'raul', destvar='RAUL', vnum='0.5.1', mandatory=True)
# Use Jack D-Bus if requested (only one jack driver is allowed)
- conf.env['HAVE_JACK_DBUS'] = conf.env['HAVE_DBUS'] and Params.g_options.jack_dbus
+ conf.env['HAVE_JACK_DBUS'] = conf.env['HAVE_DBUS'] == 1 and Params.g_options.jack_dbus
if conf.env['HAVE_JACK_DBUS']:
conf.define('HAVE_JACK_DBUS', conf.env['HAVE_JACK_DBUS'])
- if not conf.env['HAVE_JACK_DBUS']:
+ else:
autowaf.check_pkg(conf, 'jack', destvar='JACK', vnum='0.107.0', mandatory=False)
- conf.define('USE_LIBJACK', conf.env['HAVE_JACK'])
+ conf.define('USE_LIBJACK', conf.env['HAVE_JACK'] == 1)
- conf.define('HAVE_JACK_MIDI', conf.env['HAVE_JACK'] or conf.env['HAVE_JACK_DBUS'])
+ conf.define('HAVE_JACK_MIDI', conf.env['HAVE_JACK'] == 1 or conf.env['HAVE_JACK_DBUS'] == 1)
# Use Alsa if present unless --no-alsa
- if not Params.g_options.no_alsa and not conf.env['HAVE_ALSA']:
+ if not Params.g_options.no_alsa and conf.env['HAVE_ALSA'] != 1:
conf.check_pkg('alsa', destvar='ALSA', mandatory=False)
# Use LASH if we have DBUS unless --no-lash
@@ -85,10 +85,10 @@ def configure(conf):
autowaf.display_header('Patchage Configuration')
autowaf.display_msg("Install name", "'" + conf.env['APP_INSTALL_NAME'] + "'", 'CYAN')
autowaf.display_msg("App human name", "'" + conf.env['APP_HUMAN_NAME'] + "'", 'CYAN')
- autowaf.display_msg("Jack (D-Bus)", str(bool(conf.env['HAVE_JACK_DBUS'])), 'YELLOW')
- autowaf.display_msg("LASH (D-Bus)", str(bool(conf.env['HAVE_LASH'])), 'YELLOW')
- autowaf.display_msg("Jack (libjack)", str(bool(conf.env['USE_LIBJACK'])), 'YELLOW')
- autowaf.display_msg("Alsa Sequencer", str(bool(conf.env['HAVE_ALSA'])), 'YELLOW')
+ autowaf.display_msg("Jack (D-Bus)", str(conf.env['HAVE_JACK_DBUS']), 'YELLOW')
+ autowaf.display_msg("LASH (D-Bus)", str(conf.env['HAVE_LASH'] == 1), 'YELLOW')
+ autowaf.display_msg("Jack (libjack)", str(conf.env['USE_LIBJACK']), 'YELLOW')
+ autowaf.display_msg("Alsa Sequencer", str(conf.env['HAVE_ALSA'] == 1), 'YELLOW')
print
def build(bld):
@@ -123,7 +123,7 @@ def build(bld):
if bld.env()['USE_LIBJACK']:
prog.source += ' src/JackDriver.cpp '
prog.uselib += ' JACK '
- if bld.env()['HAVE_ALSA']:
+ if bld.env()['HAVE_ALSA'] == 1:
prog.source += ' src/AlsaDriver.cpp '
prog.uselib += ' ALSA '