diff options
author | Nils Philippsen <nils@tiptoe.de> | 2013-10-26 16:58:14 +0200 |
---|---|---|
committer | Nils Philippsen <nils@tiptoe.de> | 2013-10-28 09:06:09 +0100 |
commit | 5f00d2f3a7afaccaeb9f3057d55d5e1e59c54e47 (patch) | |
tree | ee5d0f92979a21ad710e0712815d5e1a56ab9c91 /libs/ardour | |
parent | 85fd343145c3ce1e2e5804c75aeccd03cf2c38a3 (diff) |
allow linking unbundled versions of some libraries
(libltc, rubberband, taglib, vamp-sdk)
Diffstat (limited to 'libs/ardour')
-rw-r--r-- | libs/ardour/ardour/audioanalyser.h | 2 | ||||
-rw-r--r-- | libs/ardour/ardour/audiofile_tagger.h | 6 | ||||
-rw-r--r-- | libs/ardour/ardour/session.h | 3 | ||||
-rw-r--r-- | libs/ardour/ardour/slave.h | 2 | ||||
-rw-r--r-- | libs/ardour/audioanalyser.cc | 2 | ||||
-rw-r--r-- | libs/ardour/audiofile_tagger.cc | 12 | ||||
-rw-r--r-- | libs/ardour/rb_effect.cc | 3 | ||||
-rw-r--r-- | libs/ardour/wscript | 31 |
8 files changed, 39 insertions, 22 deletions
diff --git a/libs/ardour/ardour/audioanalyser.h b/libs/ardour/ardour/audioanalyser.h index 035390e99f..f525cbd99f 100644 --- a/libs/ardour/ardour/audioanalyser.h +++ b/libs/ardour/ardour/audioanalyser.h @@ -25,7 +25,7 @@ #include <ostream> #include <fstream> #include <boost/utility.hpp> -#include "vamp-sdk/Plugin.h" +#include <vamp-sdk/Plugin.h> #include "ardour/types.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/audiofile_tagger.h b/libs/ardour/ardour/audiofile_tagger.h index 0519e2233c..656626a5f3 100644 --- a/libs/ardour/ardour/audiofile_tagger.h +++ b/libs/ardour/ardour/audiofile_tagger.h @@ -23,9 +23,9 @@ #include <string> -#include "taglib/tag.h" -#include "taglib/taglib.h" -#include "taglib/xiphcomment.h" +#include <taglib/tag.h> +#include <taglib/taglib.h> +#include <taglib/xiphcomment.h> namespace ARDOUR { diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 75a5dce8ef..02e883ed11 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -36,6 +36,8 @@ #include <glibmm/threads.h> +#include <ltc.h> + #include "pbd/error.h" #include "pbd/event_loop.h" #include "pbd/rcu.h" @@ -48,7 +50,6 @@ #include "midi++/types.h" #include "timecode/time.h" -#include "ltc/ltc.h" #include "ardour/ardour.h" #include "ardour/chan_count.h" diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h index a0b7b878e4..ca3f618af1 100644 --- a/libs/ardour/ardour/slave.h +++ b/libs/ardour/ardour/slave.h @@ -25,11 +25,11 @@ #include <glibmm/threads.h> #include <jack/jack.h> +#include <ltc.h> #include "pbd/signals.h" #include "timecode/time.h" -#include "ltc/ltc.h" #include "ardour/types.h" #include "midi++/parser.h" diff --git a/libs/ardour/audioanalyser.cc b/libs/ardour/audioanalyser.cc index cf8329ae9c..fd30744a74 100644 --- a/libs/ardour/audioanalyser.cc +++ b/libs/ardour/audioanalyser.cc @@ -19,7 +19,7 @@ #include <cstring> -#include "vamp-hostsdk/PluginLoader.h" +#include <vamp-hostsdk/PluginLoader.h> #include <glibmm/miscutils.h> #include <glibmm/fileutils.h> diff --git a/libs/ardour/audiofile_tagger.cc b/libs/ardour/audiofile_tagger.cc index 57650860ee..61a05d49ce 100644 --- a/libs/ardour/audiofile_tagger.cc +++ b/libs/ardour/audiofile_tagger.cc @@ -24,12 +24,12 @@ #include "pbd/convert.h" -#include "taglib/fileref.h" -#include "taglib/flacfile.h" -#include "taglib/oggfile.h" -#include "taglib/tag.h" -#include "taglib/taglib.h" -#include "taglib/xiphcomment.h" +#include <taglib/fileref.h> +#include <taglib/flacfile.h> +#include <taglib/oggfile.h> +#include <taglib/tag.h> +#include <taglib/taglib.h> +#include <taglib/xiphcomment.h> /* Convert string to TagLib::String */ #define TL_STR(string) TagLib::String ((string).c_str(), TagLib::String::UTF8) diff --git a/libs/ardour/rb_effect.cc b/libs/ardour/rb_effect.cc index a5d47d2668..804b79f87d 100644 --- a/libs/ardour/rb_effect.cc +++ b/libs/ardour/rb_effect.cc @@ -20,8 +20,9 @@ #include <algorithm> #include <cmath> +#include <rubberband/RubberBandStretcher.h> + #include "pbd/error.h" -#include "rubberband/RubberBandStretcher.h" #include "ardour/audioregion.h" #include "ardour/audiosource.h" diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 4d569837bb..7975599d89 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -333,9 +333,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 = [ @@ -400,9 +405,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']) + '"', @@ -538,9 +547,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'): + testcommon.uselib.extend(['RUBBERBAND', 'TAGLIB', 'LIBLTC', 'VAMPSDK', + 'VAMPHOSTSDK']) + else: + testcommon.use.extend(['libltc', 'librubberband', 'libtaglib', + 'libvamphost']) + testobj.name = name testobj.target = target # not sure about install path |