ardour/livetrax
13
0
Fork 0
Code

allow linking unbundled version of qm-dsp

Browse Source 
In the course, rename the bundled, built version libqm-dsp so it matches
packaged versions.
This commit is contained in:
Nils Philippsen 2016-08-14 23:49:53 +02:00 committed by Robin Gareus
parent ca90e56532
commit 0aaded5318
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/qm-dsp/wscript
View File

@ -23,10 +23,17 @@ def options(opt):
autowaf.set_options(opt) autowaf.set_options(opt)
def configure(conf): def configure(conf):
if conf.is_defined('USE_EXTERNAL_LIBS'):
conf.check_cxx(header_name="base/Pitch.h", mandatory=True)
conf.check_cxx(lib="qm-dsp", uselib_store="QMDSP", mandatory=True)
else:
conf.load('compiler_cxx') conf.load('compiler_cxx')
autowaf.configure(conf) autowaf.configure(conf)
def build(bld): def build(bld):
if bld.is_defined('USE_EXTERNAL_LIBS'):
return
# Host Library # Host Library
obj = bld(features = 'cxx cxxshlib') obj = bld(features = 'cxx cxxshlib')
obj.source = ''' obj.source = '''
@ -50,8 +57,8 @@ def build(bld):
autowaf.ensure_visible_symbols (obj, True) autowaf.ensure_visible_symbols (obj, True)
obj.export_includes = ['.'] obj.export_includes = ['.']
obj.includes = ['.'] obj.includes = ['.']
obj.name = 'libqmdsp' obj.name = 'libqm-dsp'
obj.target = 'qmdsp' obj.target = 'qm-dsp'
obj.vnum = QM_DSP_VERSION obj.vnum = QM_DSP_VERSION
obj.install_path = bld.env['LIBDIR'] obj.install_path = bld.env['LIBDIR']

4
libs/vamp-plugins/wscript
View File

@ -50,8 +50,8 @@ def build(bld):
obj.includes = ['.'] obj.includes = ['.']
obj.name = 'libardourvampplugins' obj.name = 'libardourvampplugins'
obj.target = 'ardourvampplugins' obj.target = 'ardourvampplugins'
obj.uselib = 'FFTW3F VAMPSDK' obj.uselib = 'FFTW3F VAMPSDK QMDSP'
obj.use = 'libvampplugin libqmdsp' obj.use = 'libvampplugin libqm-dsp'
autowaf.ensure_visible_symbols (obj, True) autowaf.ensure_visible_symbols (obj, True)
if bld.is_defined('HAVE_AUBIO4'): if bld.is_defined('HAVE_AUBIO4'):
obj.source += ' Onset.cpp ' obj.source += ' Onset.cpp '

6
wscript
View File

@ -773,6 +773,10 @@ def options(opt):
help='Turn on PT session import option') help='Turn on PT session import option')
opt.add_option('--no-threaded-waveviews', action='store_true', default=False, dest='no_threaded_waveviews', opt.add_option('--no-threaded-waveviews', action='store_true', default=False, dest='no_threaded_waveviews',
help='Disable threaded waveview rendering') help='Disable threaded waveview rendering')
opt.add_option(
'--qm-dsp-include', type='string', action='store',
dest='qm_dsp_include', default='/usr/include/qm-dsp',
help='directory where the header files of qm-dsp can be found')
for i in children: for i in children:
opt.recurse(i) opt.recurse(i)
@ -933,6 +937,8 @@ def configure(conf):
if Options.options.use_external_libs: if Options.options.use_external_libs:
conf.define('USE_EXTERNAL_LIBS', 1) conf.define('USE_EXTERNAL_LIBS', 1)
conf.env.append_value(
'CXXFLAGS', '-I' + Options.options.qm_dsp_include)
if Options.options.boost_include != '': if Options.options.boost_include != '':
conf.env.append_value('CXXFLAGS', '-I' + Options.options.boost_include) conf.env.append_value('CXXFLAGS', '-I' + Options.options.boost_include)