Browse Source

make build option --iio an auto option

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

+ 0
- 5
linux/wscript View File

@@ -6,11 +6,6 @@ from waflib import Context
def configure(conf):
conf.define('HAVE_PPOLL', 1 )

conf.check_cfg(package='gtkIOStream', atleast_version='1.4.0', args='--cflags --libs', mandatory=False)
conf.env['BUILD_DRIVER_IIO'] = conf.is_defined('HAVE_GTKIOSTREAM')
conf.check_cfg(package='eigen3', atleast_version='3.1.2', args='--cflags --libs', mandatory=False)
conf.env['BUILD_DRIVER_IIO'] += conf.is_defined('HAVE_EIGEN3')

def create_jack_driver_obj(bld, target, sources, uselib = None):
driver = bld(features = ['c', 'cxx', 'cxxshlib', 'cshlib'])
driver.env['cxxshlib_PATTERN'] = 'jack_%s.so'


+ 3
- 7
wscript View File

@@ -396,7 +396,9 @@ def options(opt):
firewire.add_package('libffado', atleast_version='1.999.17')
freebob = add_auto_option(opt, 'freebob', help='Enable FreeBob driver')
freebob.add_package('libfreebob', atleast_version='1.0.0')
opt.add_option('--iio', action='store_true', default=False, help='Enable IIO driver')
iio = add_auto_option(opt, 'iio', help='Enable IIO driver', conf_dest='BUILD_DRIVER_IIO')
iio.add_package('gtkIOStream', atleast_version='1.4.0')
iio.add_package('eigen3', atleast_version='3.1.2')
opt.add_option('--portaudio', action='store_true', default=False, help='Enable Portaudio driver')
opt.add_option('--winmme', action='store_true', default=False, help='Enable WinMME driver')

@@ -464,9 +466,6 @@ def configure(conf):
conf.sub_config('common')
if conf.env['IS_LINUX']:
conf.sub_config('linux')
if Options.options.iio and not conf.env['BUILD_DRIVER_IIO']:
conf.fatal('IIO driver was explicitly requested but cannot be built')
conf.env['BUILD_DRIVER_IIO'] = Options.options.iio
if conf.env['IS_WINDOWS']:
conf.sub_config('windows')
if Options.options.portaudio and not conf.env['BUILD_DRIVER_PORTAUDIO']:
@@ -662,9 +661,6 @@ def configure(conf):
# display configuration result messages for auto options
display_auto_options_messages()

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

if conf.env['IS_WINDOWS']:
display_feature('Build with WinMME support', conf.env['BUILD_DRIVER_WINMME'] == True)
display_feature('Build with Portaudio support', conf.env['BUILD_DRIVER_PORTAUDIO'] == True)


Loading…
Cancel
Save