diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2013-12-05 20:57:36 +1000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2013-12-05 20:57:36 +1000 |
| commit | ccebb050e417a6aea32811c1e1f06abaa3f85e86 (patch) | |
| tree | a4d41eb70a7f47f8ecacfdf3538b92fc42ed6242 /libs | |
| parent | b2bc7cfbe19702dd460349f2b8e025b7551d88c0 (diff) | |
Fix compile when using external version of libltc
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/session.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/slave.h | 2 | ||||
| -rw-r--r-- | libs/ardour/wscript | 7 | ||||
| -rw-r--r-- | libs/libltc/wscript | 4 |
4 files changed, 7 insertions, 8 deletions
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index ade8fa7904..9e3f4fef4d 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -36,7 +36,7 @@ #include <glibmm/threads.h> -#include <ltc/ltc.h> +#include <ltc.h> #include "pbd/error.h" #include "pbd/event_loop.h" diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h index 8c50aea5d3..cb1e3650c5 100644 --- a/libs/ardour/ardour/slave.h +++ b/libs/ardour/ardour/slave.h @@ -25,7 +25,7 @@ #include <glibmm/threads.h> #include <jack/jack.h> -#include <ltc/ltc.h> +#include <ltc.h> #include "pbd/signals.h" diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 435213b5f9..336274dcef 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -341,15 +341,14 @@ def build(bld): 'OSX','BOOST','CURL','DL'] obj.use = ['libpbd','libmidipp','libevoral', 'libvampplugin', 'libaudiographer', - 'libltc_includes', - 'libltc', 'libtimecode_includes', ] if bld.is_defined('USE_EXTERNAL_LIBS'): - obj.uselib.extend(['RUBBERBAND', 'TAGLIB', 'VAMPSDK', + obj.uselib.extend(['RUBBERBAND', 'TAGLIB', 'VAMPSDK', 'LIBLTC', 'VAMPHOSTSDK']) else: - obj.use.extend(['librubberband', 'libtaglib', 'libvamphost']) + obj.use.extend(['librubberband', 'libtaglib', 'libvamphost' + 'libltc_includes', 'libltc']) obj.vnum = LIBARDOUR_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') diff --git a/libs/libltc/wscript b/libs/libltc/wscript index 7938cd18fd..8cf7bb6389 100644 --- a/libs/libltc/wscript +++ b/libs/libltc/wscript @@ -38,13 +38,13 @@ def configure(conf): def build(bld): if bld.is_defined('USE_EXTERNAL_LIBS'): return - bld (export_includes = ['.'], - includes = ['.'], + bld (export_includes = ['ltc'], name = 'libltc_includes' ) bld.stlib (source = ['ltc.c', 'timecode.c', 'encoder.c', 'decoder.c'], cflags = [ '-fPIC' ], + includes = ['.'], target = 'libltc', use = 'libltc_includes' ) |