diff options
Diffstat (limited to 'libs/ardour/wscript')
| -rw-r--r-- | libs/ardour/wscript | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 733900e3f6..25741a77fe 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -69,6 +69,7 @@ libardour_sources = [ 'diskstream.cc', 'element_import_handler.cc', 'element_importer.cc', + 'engine_slave.cc', 'enums.cc', 'event_type_map.cc', 'export_channel.cc', @@ -103,7 +104,6 @@ libardour_sources = [ 'interpolation.cc', 'io.cc', 'io_processor.cc', - 'jack_slave.cc', 'kmeterdsp.cc', 'ladspa_plugin.cc', 'location.cc', @@ -180,7 +180,6 @@ libardour_sources = [ 'session_events.cc', 'session_export.cc', 'session_handle.cc', - 'session_jack.cc', 'session_ltc.cc', 'session_metadata.cc', 'session_midi.cc', @@ -246,8 +245,6 @@ def configure(conf): autowaf.configure(conf) autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO', 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, 'lrdf', uselib_store='LRDF', atleast_version='0.4.0') @@ -298,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/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) if flac_supported(): @@ -337,11 +331,11 @@ def build(bld): obj.name = 'libardour' obj.target = 'ardour' obj.uselib = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID', - 'JACK','SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS', + 'SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS', 'OSX','BOOST','CURL','DL'] obj.use = ['libpbd','libmidipp','libevoral','libvamphost', 'libvampplugin','libtaglib','librubberband', - 'libaudiographer','libltc'] + 'libaudiographer','libltc','libtimecode'] obj.vnum = LIBARDOUR_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') obj.defines = [ @@ -402,9 +396,9 @@ def build(bld): # only build these common sources once testcommon = bld(features = 'cxx') testcommon.includes = obj.includes + ['test', '../pbd', '..'] - testcommon.source = ['test/test_globals.cc', 'test/testrunner.cc', 'test/test_needing_session.cc', + testcommon.source = ['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'] - testcommon.uselib = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD', + testcommon.uselib = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD', 'SAMPLERATE','XML','LRDF','COREAUDIO'] testcommon.use = ['libpbd','libmidipp','libevoral','libvamphost', 'libvampplugin','libtaglib','librubberband', @@ -480,7 +474,7 @@ def build(bld): session_load_tester.includes = obj.includes 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'] session_load_tester.use = ['libpbd','libmidipp','ardour'] session_load_tester.name = 'libardour-session-load-tester' @@ -515,7 +509,7 @@ def build(bld): profilingobj.includes = obj.includes profilingobj.includes.append ('test') - profilingobj.uselib = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD', + profilingobj.uselib = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD', 'SAMPLERATE','XML','LRDF','COREAUDIO'] profilingobj.use = ['libpbd','libmidipp','ardour'] profilingobj.name = 'libardour-profiling' @@ -542,7 +536,7 @@ def create_ardour_test_program(bld, includes, name, target, sources): testobj = bld(features = 'cxx cxxprogram') testobj.includes = includes + ['test', '../pbd', '..'] testobj.source = sources - testobj.uselib = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD', + testobj.uselib = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD', 'SAMPLERATE','XML','LRDF','COREAUDIO'] testobj.use = ['libpbd','libmidipp','libevoral','libvamphost', 'libvampplugin','libtaglib','librubberband', |