diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-11-26 10:24:51 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-11-26 10:24:51 -0500 |
| commit | 08371ae2cf6231bbb8522645d14add41ffa9c1c0 (patch) | |
| tree | 5a3e1efc54a669336f6047ff23d7323eac26f287 /libs/ardour/wscript | |
| parent | d135c4dc3a307d0be606f3afbbc8fd8c3ec56438 (diff) | |
| parent | 8c2cc85e8fd1ac55761c2f53aebbe98b8f22a40a (diff) | |
resolve merge with master (?)
Diffstat (limited to 'libs/ardour/wscript')
| -rw-r--r-- | libs/ardour/wscript | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 967d089a12..e7dcf45635 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -339,9 +339,14 @@ def build(bld): obj.uselib = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID', 'SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS', 'OSX','BOOST','CURL','DL'] - obj.use = ['libpbd','libmidipp','libevoral','libvamphost', - 'libvampplugin','libtaglib','librubberband', + obj.use = ['libpbd','libmidipp','libevoral','libvampplugin', 'libaudiographer','libltc','libtimecode'] + if bld.is_defined('USE_EXTERNAL_LIBS'): + obj.uselib.extend(['RUBBERBAND', 'TAGLIB', 'LIBLTC', 'VAMPSDK', + 'VAMPHOSTSDK']) + else: + obj.use.extend(['libltc', 'librubberband', 'libtaglib', 'libvamphost']) + obj.vnum = LIBARDOUR_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') obj.defines = [ @@ -406,9 +411,13 @@ def build(bld): 'test/test_common.cc', 'test/dummy_lxvst.cc', 'test/audio_region_test.cc', 'test/test_util.cc'] testcommon.uselib = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD', 'SAMPLERATE','XML','LRDF','COREAUDIO'] - testcommon.use = ['libpbd','libmidipp','libevoral','libvamphost', - 'libvampplugin','libtaglib','librubberband', - 'libaudiographer','libltc','ardour'] + testcommon.use = ['libpbd','libmidipp','libevoral', + 'libvampplugin','libaudiographer','ardour'] + if bld.is_defined('USE_EXTERNAL_LIBS'): + testcommon.uselib.extend(['RUBBERBAND', 'TAGLIB', 'LIBLTC', 'VAMPSDK', + 'VAMPHOSTSDK']) + else: + testcommon.use.extend(['libltc', 'librubberband', 'libtaglib', 'libvamphost']) testcommon.defines = [ 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', @@ -546,9 +555,15 @@ def create_ardour_test_program(bld, includes, name, target, sources): testobj.source = sources testobj.uselib = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD', 'SAMPLERATE','XML','LRDF','COREAUDIO'] - testobj.use = ['libpbd','libmidipp','libevoral','libvamphost', - 'libvampplugin','libtaglib','librubberband', - 'libaudiographer','libltc','ardour','testcommon'] + testobj.use = ['libpbd','libmidipp','libevoral','libvampplugin', + 'libaudiographer','ardour','testcommon'] + if bld.is_defined('USE_EXTERNAL_LIBS'): + testobj.uselib.extend(['RUBBERBAND', 'TAGLIB', 'LIBLTC', 'VAMPSDK', + 'VAMPHOSTSDK']) + else: + testobj.use.extend(['libltc', 'librubberband', 'libtaglib', + 'libvamphost']) + testobj.name = name testobj.target = target # not sure about install path |