Fix compile when using external version of libltc
This commit is contained in:
@@ -36,7 +36,7 @@
|
||||
|
||||
#include <glibmm/threads.h>
|
||||
|
||||
#include <ltc/ltc.h>
|
||||
#include <ltc.h>
|
||||
|
||||
#include "pbd/error.h"
|
||||
#include "pbd/event_loop.h"
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
#include <glibmm/threads.h>
|
||||
|
||||
#include <jack/jack.h>
|
||||
#include <ltc/ltc.h>
|
||||
#include <ltc.h>
|
||||
|
||||
#include "pbd/signals.h"
|
||||
|
||||
|
||||
@@ -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')
|
||||
|
||||
@@ -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'
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user