remove link-time use of JACK, since it is now dlopen'ed by the chosen backend
This commit is contained in:
parent
c98abed37f
commit
645350815c
|
@ -245,8 +245,6 @@ def configure(conf):
|
||||||
autowaf.configure(conf)
|
autowaf.configure(conf)
|
||||||
autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO',
|
autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO',
|
||||||
atleast_version='0.3.2')
|
atleast_version='0.3.2')
|
||||||
autowaf.check_pkg(conf, 'jack', uselib_store='JACK',
|
|
||||||
atleast_version='0.118.2')
|
|
||||||
autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
|
autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
|
||||||
autowaf.check_pkg(conf, 'lrdf', uselib_store='LRDF',
|
autowaf.check_pkg(conf, 'lrdf', uselib_store='LRDF',
|
||||||
atleast_version='0.4.0')
|
atleast_version='0.4.0')
|
||||||
|
@ -297,9 +295,6 @@ def configure(conf):
|
||||||
conf.check(header_name='sys/vfs.h', define_name='HAVE_SYS_VFS_H',mandatory=False)
|
conf.check(header_name='sys/vfs.h', define_name='HAVE_SYS_VFS_H',mandatory=False)
|
||||||
conf.check(header_name='sys/statvfs.h', define_name='HAVE_SYS_STATVFS_H',mandatory=False)
|
conf.check(header_name='sys/statvfs.h', define_name='HAVE_SYS_STATVFS_H',mandatory=False)
|
||||||
|
|
||||||
conf.check(header_name='jack/session.h', uselib = [ 'JACK' ],
|
|
||||||
define_name='HAVE_JACK_SESSION')
|
|
||||||
|
|
||||||
conf.check(header_name='unistd.h', define_name='HAVE_UNISTD',mandatory=False)
|
conf.check(header_name='unistd.h', define_name='HAVE_UNISTD',mandatory=False)
|
||||||
|
|
||||||
if flac_supported():
|
if flac_supported():
|
||||||
|
@ -336,7 +331,7 @@ def build(bld):
|
||||||
obj.name = 'ardour'
|
obj.name = 'ardour'
|
||||||
obj.target = 'ardour'
|
obj.target = 'ardour'
|
||||||
obj.uselib = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID',
|
obj.uselib = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID',
|
||||||
'JACK','SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS',
|
'SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS',
|
||||||
'OSX','BOOST','CURL','DL']
|
'OSX','BOOST','CURL','DL']
|
||||||
obj.use = ['libpbd','libmidipp','libevoral','libvamphost',
|
obj.use = ['libpbd','libmidipp','libevoral','libvamphost',
|
||||||
'libvampplugin','libtaglib','librubberband',
|
'libvampplugin','libtaglib','librubberband',
|
||||||
|
@ -403,7 +398,7 @@ def build(bld):
|
||||||
testcommon.includes = obj.includes + ['test', '../pbd', '..']
|
testcommon.includes = obj.includes + ['test', '../pbd', '..']
|
||||||
testcommon.source = ['test/test_globals.cc', 'test/testrunner.cc', 'test/test_needing_session.cc',
|
testcommon.source = ['test/test_globals.cc', 'test/testrunner.cc', 'test/test_needing_session.cc',
|
||||||
'test/test_common.cc', 'test/dummy_lxvst.cc', 'test/audio_region_test.cc', 'test/test_util.cc']
|
'test/test_common.cc', 'test/dummy_lxvst.cc', 'test/audio_region_test.cc', 'test/test_util.cc']
|
||||||
testcommon.uselib = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD',
|
testcommon.uselib = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD',
|
||||||
'SAMPLERATE','XML','LRDF','COREAUDIO']
|
'SAMPLERATE','XML','LRDF','COREAUDIO']
|
||||||
testcommon.use = ['libpbd','libmidipp','libevoral','libvamphost',
|
testcommon.use = ['libpbd','libmidipp','libevoral','libvamphost',
|
||||||
'libvampplugin','libtaglib','librubberband',
|
'libvampplugin','libtaglib','librubberband',
|
||||||
|
@ -479,7 +474,7 @@ def build(bld):
|
||||||
|
|
||||||
session_load_tester.includes = obj.includes
|
session_load_tester.includes = obj.includes
|
||||||
session_load_tester.includes.append ('test')
|
session_load_tester.includes.append ('test')
|
||||||
session_load_tester.uselib = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD',
|
session_load_tester.uselib = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD',
|
||||||
'SAMPLERATE','XML','LRDF','COREAUDIO']
|
'SAMPLERATE','XML','LRDF','COREAUDIO']
|
||||||
session_load_tester.use = ['libpbd','libmidipp','ardour']
|
session_load_tester.use = ['libpbd','libmidipp','ardour']
|
||||||
session_load_tester.name = 'libardour-session-load-tester'
|
session_load_tester.name = 'libardour-session-load-tester'
|
||||||
|
@ -514,7 +509,7 @@ def build(bld):
|
||||||
|
|
||||||
profilingobj.includes = obj.includes
|
profilingobj.includes = obj.includes
|
||||||
profilingobj.includes.append ('test')
|
profilingobj.includes.append ('test')
|
||||||
profilingobj.uselib = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD',
|
profilingobj.uselib = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD',
|
||||||
'SAMPLERATE','XML','LRDF','COREAUDIO']
|
'SAMPLERATE','XML','LRDF','COREAUDIO']
|
||||||
profilingobj.use = ['libpbd','libmidipp','ardour']
|
profilingobj.use = ['libpbd','libmidipp','ardour']
|
||||||
profilingobj.name = 'libardour-profiling'
|
profilingobj.name = 'libardour-profiling'
|
||||||
|
@ -541,7 +536,7 @@ def create_ardour_test_program(bld, includes, name, target, sources):
|
||||||
testobj = bld(features = 'cxx cxxprogram')
|
testobj = bld(features = 'cxx cxxprogram')
|
||||||
testobj.includes = includes + ['test', '../pbd', '..']
|
testobj.includes = includes + ['test', '../pbd', '..']
|
||||||
testobj.source = sources
|
testobj.source = sources
|
||||||
testobj.uselib = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD',
|
testobj.uselib = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD',
|
||||||
'SAMPLERATE','XML','LRDF','COREAUDIO']
|
'SAMPLERATE','XML','LRDF','COREAUDIO']
|
||||||
testobj.use = ['libpbd','libmidipp','libevoral','libvamphost',
|
testobj.use = ['libpbd','libmidipp','libevoral','libvamphost',
|
||||||
'libvampplugin','libtaglib','librubberband',
|
'libvampplugin','libtaglib','librubberband',
|
||||||
|
|
Loading…
Reference in New Issue
Block a user