Browse Source

make build option --firewire an auto option

tags/v1.9.11-RC1
Karl Lindén 10 years ago
parent
commit
1b27e13418
2 changed files with 2 additions and 8 deletions
  1. +0
    -3
      linux/wscript
  2. +2
    -5
      wscript

+ 0
- 3
linux/wscript View File

@@ -7,9 +7,6 @@ def configure(conf):
conf. check_cfg(package='libfreebob', atleast_version='1.0.0', args='--cflags --libs', mandatory=False) conf. check_cfg(package='libfreebob', atleast_version='1.0.0', args='--cflags --libs', mandatory=False)
conf.env['BUILD_DRIVER_FREEBOB'] = conf.is_defined('HAVE_LIBFREEBOB') conf.env['BUILD_DRIVER_FREEBOB'] = conf.is_defined('HAVE_LIBFREEBOB')


conf. check_cfg(package='libffado', atleast_version='1.999.17', args='--cflags --libs', mandatory=False)
conf.env['BUILD_DRIVER_FFADO'] = conf.is_defined('HAVE_LIBFFADO')

conf.define('HAVE_PPOLL', 1 ) conf.define('HAVE_PPOLL', 1 )


conf.check_cfg(package='gtkIOStream', atleast_version='1.4.0', args='--cflags --libs', mandatory=False) conf.check_cfg(package='gtkIOStream', atleast_version='1.4.0', args='--cflags --libs', mandatory=False)


+ 2
- 5
wscript View File

@@ -392,7 +392,8 @@ def options(opt):
doxygen.add_program('doxygen') doxygen.add_program('doxygen')
alsa = add_auto_option(opt, 'alsa', help='Enable ALSA driver', conf_dest='BUILD_DRIVER_ALSA') alsa = add_auto_option(opt, 'alsa', help='Enable ALSA driver', conf_dest='BUILD_DRIVER_ALSA')
alsa.add_package('alsa', atleast_version='1.0.18') alsa.add_package('alsa', atleast_version='1.0.18')
opt.add_option('--firewire', action='store_true', default=False, help='Enable FireWire driver (FFADO)')
firewire = add_auto_option(opt, 'firewire', help='Enable FireWire driver (FFADO)', conf_dest='BUILD_DRIVER_FFADO')
firewire.add_package('libffado', atleast_version='1.999.17')
opt.add_option('--freebob', action='store_true', default=False, help='Enable FreeBob driver') opt.add_option('--freebob', action='store_true', default=False, help='Enable FreeBob driver')
opt.add_option('--iio', action='store_true', default=False, help='Enable IIO driver') opt.add_option('--iio', action='store_true', default=False, help='Enable IIO driver')
opt.add_option('--portaudio', action='store_true', default=False, help='Enable Portaudio driver') opt.add_option('--portaudio', action='store_true', default=False, help='Enable Portaudio driver')
@@ -464,11 +465,8 @@ def configure(conf):
conf.sub_config('linux') conf.sub_config('linux')
if Options.options.freebob and not conf.env['BUILD_DRIVER_FREEBOB']: if Options.options.freebob and not conf.env['BUILD_DRIVER_FREEBOB']:
conf.fatal('FreeBob driver was explicitly requested but cannot be built') conf.fatal('FreeBob driver was explicitly requested but cannot be built')
if Options.options.firewire and not conf.env['BUILD_DRIVER_FFADO']:
conf.fatal('FFADO driver was explicitly requested but cannot be built')
if Options.options.iio and not conf.env['BUILD_DRIVER_IIO']: if Options.options.iio and not conf.env['BUILD_DRIVER_IIO']:
conf.fatal('IIO driver was explicitly requested but cannot be built') conf.fatal('IIO driver was explicitly requested but cannot be built')
conf.env['BUILD_DRIVER_FFADO'] = Options.options.firewire
conf.env['BUILD_DRIVER_FREEBOB'] = Options.options.freebob conf.env['BUILD_DRIVER_FREEBOB'] = Options.options.freebob
conf.env['BUILD_DRIVER_IIO'] = Options.options.iio conf.env['BUILD_DRIVER_IIO'] = Options.options.iio
if conf.env['IS_WINDOWS']: if conf.env['IS_WINDOWS']:
@@ -668,7 +666,6 @@ def configure(conf):


if conf.env['IS_LINUX']: if conf.env['IS_LINUX']:
display_feature('Build with FireWire (FreeBob) support', conf.env['BUILD_DRIVER_FREEBOB'] == True) display_feature('Build with FireWire (FreeBob) support', conf.env['BUILD_DRIVER_FREEBOB'] == True)
display_feature('Build with FireWire (FFADO) support', conf.env['BUILD_DRIVER_FFADO'] == True)
display_feature('Build with IIO support', conf.env['BUILD_DRIVER_IIO'] == True) display_feature('Build with IIO support', conf.env['BUILD_DRIVER_IIO'] == True)


if conf.env['IS_WINDOWS']: if conf.env['IS_WINDOWS']:


Loading…
Cancel
Save