smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 14:54:56 +01:00
Code Issues Projects Releases Wiki Activity

Fix compile when using external version of libltc

Browse source
This commit is contained in:
Tim Mayberry 2013-12-05 20:57:36 +10:00
parent b2bc7cfbe1
commit ccebb050e4
4 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/ardour/session.h
View file

@ -36,7 +36,7 @@
#include <glibmm/threads.h> #include <glibmm/threads.h>
#include <ltc/ltc.h> #include <ltc.h>
#include "pbd/error.h" #include "pbd/error.h"
#include "pbd/event_loop.h" #include "pbd/event_loop.h"

2
libs/ardour/ardour/slave.h
View file

@ -25,7 +25,7 @@
#include <glibmm/threads.h> #include <glibmm/threads.h>
#include <jack/jack.h> #include <jack/jack.h>
#include <ltc/ltc.h> #include <ltc.h>
#include "pbd/signals.h" #include "pbd/signals.h"

7
libs/ardour/wscript
View file

@ -341,15 +341,14 @@ def build(bld):
'OSX','BOOST','CURL','DL'] 'OSX','BOOST','CURL','DL']
obj.use = ['libpbd','libmidipp','libevoral', 'libvampplugin', obj.use = ['libpbd','libmidipp','libevoral', 'libvampplugin',
'libaudiographer', 'libaudiographer',
'libltc_includes',
'libltc',
'libtimecode_includes', 'libtimecode_includes',
] ]
if bld.is_defined('USE_EXTERNAL_LIBS'): if bld.is_defined('USE_EXTERNAL_LIBS'):
obj.uselib.extend(['RUBBERBAND', 'TAGLIB', 'VAMPSDK', obj.uselib.extend(['RUBBERBAND', 'TAGLIB', 'VAMPSDK', 'LIBLTC',
'VAMPHOSTSDK']) 'VAMPHOSTSDK'])
else: else:
obj.use.extend(['librubberband', 'libtaglib', 'libvamphost']) obj.use.extend(['librubberband', 'libtaglib', 'libvamphost'
'libltc_includes', 'libltc'])
obj.vnum = LIBARDOUR_LIB_VERSION obj.vnum = LIBARDOUR_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')

4
libs/libltc/wscript
View file

@ -38,13 +38,13 @@ def configure(conf):
def build(bld): def build(bld):
if bld.is_defined('USE_EXTERNAL_LIBS'): if bld.is_defined('USE_EXTERNAL_LIBS'):
return return
bld (export_includes = ['.'], bld (export_includes = ['ltc'],
includes = ['.'],
name = 'libltc_includes' name = 'libltc_includes'
) )
bld.stlib (source = ['ltc.c', 'timecode.c', 'encoder.c', 'decoder.c'], bld.stlib (source = ['ltc.c', 'timecode.c', 'encoder.c', 'decoder.c'],
cflags = [ '-fPIC' ], cflags = [ '-fPIC' ],
includes = ['.'],
target = 'libltc', target = 'libltc',
use = 'libltc_includes' use = 'libltc_includes'
) )