Browse Source

use conf.env['SAMPLERATE'] to determine wether samplerate is available instead of conf.is_defined('HAVE_SAMPLERATE')

tags/v1.9.11-RC1
Karl Lindén 10 years ago
parent
commit
94efc64f20
3 changed files with 6 additions and 3 deletions
  1. +2
    -2
      common/wscript
  2. +1
    -1
      example-clients/wscript
  3. +3
    -0
      wscript

+ 2
- 2
common/wscript View File

@@ -6,8 +6,8 @@ import re
import os

def configure(conf):
conf.env['BUILD_NETLIB'] = conf.is_defined('HAVE_SAMPLERATE')
conf.env['BUILD_ADAPTER'] = conf.is_defined('HAVE_SAMPLERATE')
conf.env['BUILD_NETLIB'] = conf.env['SAMPLERATE']
conf.env['BUILD_ADAPTER'] = conf.env['SAMPLERATE']

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


+ 1
- 1
example-clients/wscript View File

@@ -51,7 +51,7 @@ def configure(conf):

conf.env['BUILD_EXAMPLE_CLIENT_REC'] = conf.is_defined('HAVE_SNDFILE')

conf.env['BUILD_EXAMPLE_ALSA_IO'] = conf.is_defined('HAVE_SAMPLERATE') and conf.env['BUILD_DRIVER_ALSA']
conf.env['BUILD_EXAMPLE_ALSA_IO'] = conf.env['SAMPLERATE'] and conf.env['BUILD_DRIVER_ALSA']

def build(bld):
if bld.env['IS_LINUX']:


+ 3
- 0
wscript View File

@@ -495,6 +495,9 @@ def configure(conf):

if conf.is_defined('HAVE_SAMPLERATE'):
conf.env['LIB_SAMPLERATE'] = ['samplerate']
conf.env['SAMPLERATE'] = True
else:
conf.env['SAMPLERATE'] = False

conf.sub_config('common')
if conf.env['IS_LINUX']:


Loading…
Cancel
Save