Browse Source

make build option --portaudio an auto option

tags/v1.9.11-RC1
Karl Lindén 10 years ago
parent
commit
fcec68f903
2 changed files with 4 additions and 10 deletions
  1. +0
    -4
      windows/wscript
  2. +4
    -6
      wscript

+ 0
- 4
windows/wscript View File

@@ -1,10 +1,6 @@
#! /usr/bin/env python #! /usr/bin/env python
# encoding: utf-8 # encoding: utf-8


def configure(conf):
conf.check_cfg(package='portaudio-2.0', uselib_store='PORTAUDIO', atleast_version='19', args='--cflags --libs')
conf.env['BUILD_DRIVER_PORTAUDIO'] = conf.is_defined('HAVE_PORTAUDIO')

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


+ 4
- 6
wscript View File

@@ -399,7 +399,9 @@ def options(opt):
iio = add_auto_option(opt, 'iio', help='Enable IIO driver', conf_dest='BUILD_DRIVER_IIO') 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('gtkIOStream', atleast_version='1.4.0')
iio.add_package('eigen3', atleast_version='3.1.2') iio.add_package('eigen3', atleast_version='3.1.2')
opt.add_option('--portaudio', action='store_true', default=False, help='Enable Portaudio driver')
portaudio = add_auto_option(opt, 'portaudio', help='Enable Portaudio driver', conf_dest='BUILD_DRIVER_PORTAUDIO')
portaudio.add_header('windows.h') # only build portaudio on windows
portaudio.add_package('portaudio-2.0', uselib_store='PORTAUDIO', atleast_version='19')
opt.add_option('--winmme', action='store_true', default=False, help='Enable WinMME driver') opt.add_option('--winmme', action='store_true', default=False, help='Enable WinMME driver')


# dbus options # dbus options
@@ -467,10 +469,7 @@ def configure(conf):
if conf.env['IS_LINUX']: if conf.env['IS_LINUX']:
conf.sub_config('linux') conf.sub_config('linux')
if conf.env['IS_WINDOWS']: if conf.env['IS_WINDOWS']:
conf.sub_config('windows')
if Options.options.portaudio and not conf.env['BUILD_DRIVER_PORTAUDIO']:
conf.fatal('Portaudio driver was explicitly requested but cannot be built')
conf.env['BUILD_DRIVER_WINMME'] = Options.options.winmme
conf.env['BUILD_DRIVER_WINMME'] = Options.options.winmme
if Options.options.dbus: if Options.options.dbus:
conf.sub_config('dbus') conf.sub_config('dbus')
if conf.env['BUILD_JACKDBUS'] != True: if conf.env['BUILD_JACKDBUS'] != True:
@@ -663,7 +662,6 @@ def configure(conf):


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


if conf.env['BUILD_JACKDBUS'] == True: if conf.env['BUILD_JACKDBUS'] == True:
display_msg('D-Bus service install directory', conf.env['DBUS_SERVICES_DIR'], 'CYAN') display_msg('D-Bus service install directory', conf.env['DBUS_SERVICES_DIR'], 'CYAN')


Loading…
Cancel
Save