X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fwscript;h=b4a50a888b0eca3e2e57296c255e0fbff901466d;hb=79db9422ac70605cb3b706c3a19cf1c4e00af2f1;hp=25a2cb6d9201d097266625f99ad5f71377117f86;hpb=92432f3e80d621816ac0b05484eb59fb9348ac34;p=ardour.git diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 25a2cb6d92..b4a50a888b 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -23,7 +23,7 @@ CURRENT_SESSION_FILE_VERSION = 3001 # Variables for 'waf dist' APPNAME = 'libardour3' VERSION = LIBARDOUR_VERSION -I18N_PACKAGE = 'libardour3' +I18N_PACKAGE = 'ardour3' # Mandatory variables top = '.' @@ -55,6 +55,7 @@ libardour_sources = [ 'automation.cc', 'automation_control.cc', 'automation_list.cc', + 'automation_watch.cc', 'beats_frames_converter.cc', 'broadcast_info.cc', 'buffer.cc', @@ -62,7 +63,6 @@ libardour_sources = [ 'buffer_set.cc', 'bundle.cc', 'butler.cc', - 'callback.cc', 'capturing_processor.cc', 'chan_count.cc', 'chan_mapping.cc', @@ -115,6 +115,7 @@ libardour_sources = [ 'ladspa_plugin.cc', 'location.cc', 'location_importer.cc', + 'ltc_slave.cc', 'meter.cc', 'midi_automation_list_binder.cc', 'midi_buffer.cc', @@ -138,7 +139,6 @@ libardour_sources = [ 'mtc_slave.cc', 'mtdm.cc', 'mute_master.cc', - 'named_selection.cc', 'onset_detector.cc', 'operations.cc', 'pan_controllable.cc', @@ -184,6 +184,7 @@ libardour_sources = [ 'session_events.cc', 'session_export.cc', 'session_handle.cc', + 'session_ltc.cc', 'session_metadata.cc', 'session_midi.cc', 'session_object.cc', @@ -194,7 +195,6 @@ libardour_sources = [ 'session_state_utils.cc', 'session_time.cc', 'session_transport.cc', - 'session_utils.cc', 'slave.cc', 'smf_source.cc', 'sndfile_helpers.cc', @@ -217,7 +217,7 @@ libardour_sources = [ 'user_bundle.cc', 'utils.cc', 'version.cc', - 'worker.cc', + 'worker.cc' ] def flac_supported(): @@ -259,6 +259,8 @@ def configure(conf): if Options.options.lv2: autowaf.check_pkg(conf, 'lv2', uselib_store='LV2', atleast_version='1.0.0', mandatory=True) + autowaf.check_pkg(conf, 'lv2', uselib_store='NEW_LV2', + atleast_version='1.0.15', mandatory=False) autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD', atleast_version='0.14.0', mandatory=True) autowaf.check_pkg(conf, 'sord-0', uselib_store='SORD', @@ -267,6 +269,8 @@ def configure(conf): atleast_version='0.2.0', mandatory=True) autowaf.check_pkg(conf, 'lilv-0', uselib_store='LILV', atleast_version='0.14.0', mandatory=True) + autowaf.check_pkg(conf, 'lilv-0', uselib_store='NEW_LILV', + atleast_version='0.15.0', mandatory=False) autowaf.check_pkg(conf, 'suil-0', uselib_store='SUIL', atleast_version='0.6.0', mandatory=False) conf.define ('LV2_SUPPORT', 1) @@ -337,6 +341,19 @@ int main(int argc, char **argv) { mandatory = True, errmsg = missing_jack_message) + conf.check_cc(fragment = ''' +#include +int main(int argc, char** argv) { + jack_position_t pos; + pos.valid & JackVideoFrameOffset; + return 0; +}''', + uselib= [ 'JACK' ], + msg = 'Checking for JackVideoFrameOffset', + define_name = 'HAVE_JACK_VIDEO_SUPPORT', + mandatory = False, + okmsg = 'present') + if flac_supported(): conf.define ('HAVE_FLAC', 1) if ogg_supported(): @@ -364,7 +381,7 @@ def build(bld): 'OSX','BOOST','CURL','DL'] obj.use = ['libpbd','libmidipp','libevoral','libvamphost', 'libvampplugin','libtaglib','librubberband', - 'libaudiographer'] + 'libaudiographer','libltc'] obj.vnum = LIBARDOUR_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') obj.defines = [ @@ -372,7 +389,8 @@ def build(bld): 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', 'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"', - 'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"' + 'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"', + 'EVORAL_MIDI_XML=1' ] #obj.source += ' st_stretch.cc st_pitch.cc ' @@ -424,10 +442,12 @@ def build(bld): testobj = bld(features = 'cxx cxxprogram') testobj.source = ''' test/dummy_lxvst.cc + test/test_util.cc test/test_needing_session.cc test/audio_region_test.cc test/test_globals.cc test/audio_region_read_test.cc + test/automation_list_property_test.cc test/bbt_test.cc test/tempo_test.cc test/interpolation_test.cc @@ -438,8 +458,11 @@ def build(bld): test/framepos_minus_beats_test.cc test/playlist_layering_test.cc test/playlist_read_test.cc + test/playlist_equivalent_regions_test.cc test/control_surfaces_test.cc test/combine_regions_test.cc + test/region_naming_test.cc + test/load_sessions_test.cc test/mtdm_test.cc test/testrunner.cc '''.split() @@ -471,21 +494,23 @@ def build(bld): elif bld.env['build_target'] == 'x86_64': testobj.source += [ 'sse_functions_64bit.s' ] - # Profiling - profilingobj = bld(features = 'cxx cxxprogram') - profilingobj.source = ''' - test/dummy_lxvst.cc - test/profiling/runpc.cc - '''.split() - - profilingobj.includes = obj.includes - profilingobj.uselib = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD', + # Tester to just load a session + session_load_tester = bld(features = 'cxx cxxprogram') + session_load_tester.source = ''' + test/test_util.cc + test/load_session.cc + test/dummy_lxvst.cc + '''.split() + + session_load_tester.includes = obj.includes + session_load_tester.includes.append ('test') + session_load_tester.uselib = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD', 'SAMPLERATE','XML','LRDF','COREAUDIO'] - profilingobj.use = ['libpbd','libmidipp','libardour'] - profilingobj.name = 'libardour-profiling' - profilingobj.target = 'run-profiling' - profilingobj.install_path = '' - profilingobj.defines = [ + session_load_tester.use = ['libpbd','libmidipp','libardour'] + session_load_tester.name = 'libardour-session-load-tester' + session_load_tester.target = 'load-session' + session_load_tester.install_path = '' + session_load_tester.defines = [ 'PACKAGE="libardour3profile"', 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', @@ -495,12 +520,47 @@ def build(bld): os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"' ] if bld.env['FPU_OPTIMIZATION']: - profilingobj.source += [ 'sse_functions_xmm.cc' ] + session_load_tester.source += [ 'sse_functions_xmm.cc' ] if (bld.env['build_target'] == 'i386' or bld.env['build_target'] == 'i686'): - profilingobj.source += [ 'sse_functions.s' ] + session_load_tester.source += [ 'sse_functions.s' ] elif bld.env['build_target'] == 'x86_64': - profilingobj.source += [ 'sse_functions_64bit.s' ] + session_load_tester.source += [ 'sse_functions_64bit.s' ] + + # Profiling + for p in ['runpc', 'lots_of_regions', 'load_session']: + profilingobj = bld(features = 'cxx cxxprogram') + profilingobj.source = ''' + test/dummy_lxvst.cc + test/test_util.cc + '''.split() + + profilingobj.source.append('test/profiling/%s.cc' % p) + + profilingobj.includes = obj.includes + profilingobj.includes.append ('test') + profilingobj.uselib = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD', + 'SAMPLERATE','XML','LRDF','COREAUDIO'] + profilingobj.use = ['libpbd','libmidipp','libardour'] + profilingobj.name = 'libardour-profiling' + profilingobj.target = p + profilingobj.install_path = '' + profilingobj.defines = [ + 'PACKAGE="libardour3profile"', + 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', + 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', + 'LOCALEDIR="' + os.path.join( + os.path.normpath(bld.env['DATADIR']), 'locale') + '"', + 'VAMP_DIR="' + os.path.join( + os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '"' + ] + if bld.env['FPU_OPTIMIZATION']: + profilingobj.source += [ 'sse_functions_xmm.cc' ] + if (bld.env['build_target'] == 'i386' + or bld.env['build_target'] == 'i686'): + profilingobj.source += [ 'sse_functions.s' ] + elif bld.env['build_target'] == 'x86_64': + profilingobj.source += [ 'sse_functions_64bit.s' ] def shutdown(): autowaf.shutdown()