From fbac3a0df8d0caf195e13407fde123201bdcde2e Mon Sep 17 00:00:00 2001 From: sletz Date: Wed, 18 Nov 2009 17:09:32 +0000 Subject: [PATCH] Cleanup wscripts. git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3809 0c269be4-1314-0410-8aa9-9f06e86f4224 --- example-clients/wscript | 11 ++++++----- linux/wscript | 4 ++-- macosx/wscript | 11 ++++++----- wscript | 18 +++++++++--------- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/example-clients/wscript b/example-clients/wscript index dcccdae7..04cc9c4f 100644 --- a/example-clients/wscript +++ b/example-clients/wscript @@ -120,11 +120,12 @@ def build(bld): prog.includes = os_incdir + ['../common/jack', '../common'] prog.source = ['netsource.c', '../common/netjack_packet.c'] prog.env.append_value("CCFLAGS", "-DNO_JACK_ERROR") - if bld.env['HAVE_CELT']: - if bld.env['HAVE_CELT_API_0_5']: - prog.defines = ['HAVE_CELT', 'HAVE_CELT_API_0_5'] - elif bld.env['HAVE_CELT_API_0_7']: - prog.defines = ['HAVE_CELT', 'HAVE_CELT_API_0_7'] + # Seems uneeded here... + #if bld.env['HAVE_CELT']: + #if bld.env['HAVE_CELT_API_0_5']: + # prog.defines = ['HAVE_CELT', 'HAVE_CELT_API_0_5'] + #elif bld.env['HAVE_CELT_API_0_7']: + # prog.defines = ['HAVE_CELT', 'HAVE_CELT_API_0_7'] prog.uselib = 'CELT SAMPLERATE' prog.uselib_local = 'clientlib' prog.target = 'jack_netsource' diff --git a/linux/wscript b/linux/wscript index 1713750d..56a77330 100644 --- a/linux/wscript +++ b/linux/wscript @@ -69,6 +69,6 @@ def build(bld): create_jack_driver_obj(bld, 'loopback', '../common/JackLoopbackDriver.cpp') create_jack_driver_obj(bld, 'netone', [ '../common/JackNetOneDriver.cpp', - '../common/netjack.c', - '../common/netjack_packet.c' ], "SAMPLERATE CELT" ) + '../common/netjack.c', + '../common/netjack_packet.c' ], "SAMPLERATE CELT" ) diff --git a/macosx/wscript b/macosx/wscript index 1a1c9615..8fa9bd37 100644 --- a/macosx/wscript +++ b/macosx/wscript @@ -6,11 +6,12 @@ def create_jack_driver_obj(bld, target, sources, uselib = None): driver.features.append('cc') driver.env['shlib_PATTERN'] = 'jack_%s.so' driver.defines = ['HAVE_CONFIG_H','SERVER_SIDE'] - if bld.env['HAVE_CELT']: - if bld.env['HAVE_CELT_API_0_5']: - driver.defines += ['HAVE_CELT', 'HAVE_CELT_API_0_5'] - elif bld.env['HAVE_CELT_API_0_7']: - driver.defines += ['HAVE_CELT', 'HAVE_CELT_API_0_7'] + # Seems uneeded here... + #if bld.env['HAVE_CELT']: + #if bld.env['HAVE_CELT_API_0_5']: + # driver.defines += ['HAVE_CELT', 'HAVE_CELT_API_0_5'] + #elif bld.env['HAVE_CELT_API_0_7']: + # driver.defines += ['HAVE_CELT', 'HAVE_CELT_API_0_7'] driver.includes = ['.', '../macosx', '../posix', '../common', '../common/jack'] driver.target = target driver.source = sources diff --git a/wscript b/wscript index eaf40fca..a9128cca 100644 --- a/wscript +++ b/wscript @@ -115,17 +115,17 @@ def configure(conf): conf.sub_config('example-clients') if conf.check_cfg(package='celt', atleast_version='0.7.0', args='--cflags --libs'): - conf.define('HAVE_CELT', 1) - conf.define('HAVE_CELT_API_0_7', 1) - conf.define('HAVE_CELT_API_0_5', 0) + conf.define('HAVE_CELT', 1) + conf.define('HAVE_CELT_API_0_7', 1) + conf.define('HAVE_CELT_API_0_5', 0) elif conf.check_cfg(package='celt', atleast_version='0.5.0', args='--cflags --libs', required=True): - conf.define('HAVE_CELT', 1) - conf.define('HAVE_CELT_API_0_5', 1) - conf.define('HAVE_CELT_API_0_7', 0) + conf.define('HAVE_CELT', 1) + conf.define('HAVE_CELT_API_0_5', 1) + conf.define('HAVE_CELT_API_0_7', 0) else: - conf.define('HAVE_CELT', 0) - conf.define('HAVE_CELT_API_0_5', 0) - conf.define('HAVE_CELT_API_0_7', 0) + conf.define('HAVE_CELT', 0) + conf.define('HAVE_CELT_API_0_5', 0) + conf.define('HAVE_CELT_API_0_7', 0) conf.env['LIB_PTHREAD'] = ['pthread'] conf.env['LIB_DL'] = ['dl'] -- 2.11.4.GIT