X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fwscript;h=115e12cbecff34649a9ec04aa02b0c879b607a7a;hb=8488d8f6a53d3385893a435481cb60ed21c21ea0;hp=7031ee6bb001402de369b9d76a2ac90f38a7f587;hpb=38b32414babf2c0007d799a208e7a61a56c334fd;p=ardour.git diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 7031ee6bb0..115e12cbec 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -10,9 +10,7 @@ import sys # default state file version for this build CURRENT_SESSION_FILE_VERSION = 3001 -# Variables for 'waf dist' -APPNAME = 'libardour3' -I18N_PACKAGE = 'ardour3' +I18N_PACKAGE = 'ardour' # Mandatory variables top = '.' @@ -56,13 +54,13 @@ libardour_sources = [ 'capturing_processor.cc', 'chan_count.cc', 'chan_mapping.cc', - 'configuration.cc', 'config_text.cc', 'control_protocol_manager.cc', 'cycle_timer.cc', 'data_type.cc', 'default_click.cc', 'debug.cc', + 'delayline.cc', 'delivery.cc', 'directory_names.cc', 'diskstream.cc', @@ -104,12 +102,14 @@ libardour_sources = [ 'io_processor.cc', 'kmeterdsp.cc', 'ladspa_plugin.cc', + 'legatize.cc', 'location.cc', 'location_importer.cc', 'ltc_slave.cc', 'meter.cc', 'midi_automation_list_binder.cc', 'midi_buffer.cc', + 'midi_channel_filter.cc', 'midi_clock_slave.cc', 'midi_diskstream.cc', 'midi_model.cc', @@ -119,6 +119,8 @@ libardour_sources = [ 'midi_port.cc', 'midi_region.cc', 'midi_ring_buffer.cc', + 'midi_scene_change.cc', + 'midi_scene_changer.cc', 'midi_source.cc', 'midi_state_tracker.cc', 'midi_stretch.cc', @@ -128,8 +130,10 @@ libardour_sources = [ 'mix.cc', 'monitor_processor.cc', 'mtc_slave.cc', + 'mididm.cc', 'mtdm.cc', 'mute_master.cc', + 'note_fixer.cc', 'onset_detector.cc', 'operations.cc', 'pan_controllable.cc', @@ -137,6 +141,7 @@ libardour_sources = [ 'panner.cc', 'panner_manager.cc', 'panner_shell.cc', + 'parameter_descriptor.cc', 'pcm_utils.cc', 'playlist.cc', 'playlist_factory.cc', @@ -164,6 +169,7 @@ libardour_sources = [ 'route_group.cc', 'route_group_member.cc', 'rb_effect.cc', + 'scene_change.cc', 'search_paths.cc', 'send.cc', 'session.cc', @@ -191,6 +197,7 @@ libardour_sources = [ 'sndfile_helpers.cc', 'sndfileimportable.cc', 'sndfilesource.cc', + 'soundcloud_upload.cc', 'source.cc', 'source_factory.cc', 'speakers.cc', @@ -206,10 +213,10 @@ libardour_sources = [ 'ticker.cc', 'track.cc', 'transient_detector.cc', + 'transform.cc', 'unknown_processor.cc', 'user_bundle.cc', 'utils.cc', - 'version.cc', 'vumeterdsp.cc', 'worker.cc' ] @@ -235,11 +242,6 @@ def configure(conf): conf.load('compiler_cxx') conf.load('gas') # we don't use hard-coded micro versions with ardour, so hard code it to zero - autowaf.build_version_files( - path_prefix + 'ardour/version.h', - path_prefix + 'version.cc', - 'libardour3', conf.env['MAJOR'], conf.env['MINOR'], 0, - 'LIBARDOUR_API', 'ardour/libardour_visibility.h') autowaf.configure(conf) autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO', atleast_version='0.3.2') @@ -247,8 +249,9 @@ def configure(conf): atleast_version='0.4.0', mandatory=False) autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML') if Options.options.dist_target != 'mingw': - autowaf.check_pkg(conf, 'lrdf', uselib_store='LRDF', - atleast_version='0.4.0') + if not Options.options.no_lrdf: + autowaf.check_pkg(conf, 'lrdf', uselib_store='LRDF', + atleast_version='0.4.0') autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO', atleast_version='0.3.2') autowaf.check_pkg(conf, 'samplerate', uselib_store='SAMPLERATE', @@ -259,8 +262,10 @@ 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, 'lv2', uselib_store='LV2_1_2_0', + atleast_version='1.2.0', mandatory=False) + autowaf.check_pkg(conf, 'lv2', uselib_store='LV2_1_10_0', + atleast_version='1.10.0', 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', @@ -269,8 +274,12 @@ 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, 'lilv-0', uselib_store='LILV_0_16_0', + atleast_version='0.16.0', mandatory=False) + autowaf.check_pkg(conf, 'lilv-0', uselib_store='LILV_0_19_2', + atleast_version='0.19.2', mandatory=False) + autowaf.check_pkg(conf, 'lilv-0', uselib_store='LILV_0_21_3', + atleast_version='0.21.3', mandatory=False) autowaf.check_pkg(conf, 'suil-0', uselib_store='SUIL', atleast_version='0.6.0', mandatory=False) conf.define ('LV2_SUPPORT', 1) @@ -322,13 +331,17 @@ def build(bld): # micro increment <=> no interface changes LIBARDOUR_LIB_VERSION = "3.0.0" + sources = libardour_sources + if bld.is_tracks_build(): + sources += [ 'engine_state_controller.cc' ] + # Library if bld.is_defined ('INTERNAL_SHARED_LIBS'): - obj = bld.shlib(features = 'c cxx cshlib cxxshlib', source=libardour_sources) + obj = bld.shlib(features = 'c cxx cshlib cxxshlib', source=sources) # macros for this shared library obj.defines = [ 'LIBARDOUR_DLL_EXPORTS=1' ] else: - obj = bld.stlib(features = 'c cxx cstlib cxxstlib', source=libardour_sources) + obj = bld.stlib(features = 'c cxx cstlib cxxstlib', source=sources) obj.cxxflags = [ '-fPIC' ] obj.cflags = [ '-fPIC' ] obj.defines = [] @@ -352,12 +365,13 @@ def build(bld): obj.use.extend(['librubberband', 'libltc_includes', 'libltc']) obj.vnum = LIBARDOUR_LIB_VERSION - obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') + obj.install_path = bld.env['LIBDIR'] obj.defines += [ - 'PACKAGE="' + I18N_PACKAGE + '"', + 'PACKAGE="' + I18N_PACKAGE + str(bld.env['MAJOR']) + '"', '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') + '"', + 'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"', + 'LIBARDOUR="' + bld.env['lwrcase_dirname'] + '"', 'EVORAL_MIDI_XML=1', ] @@ -376,7 +390,7 @@ def build(bld): obj.includes += [ '../fst' ] obj.defines += [ 'WINDOWS_VST_SUPPORT' ] if bld.env['build_target'] == 'mingw': - obj.source += [ '../fst/vstwin.c', '../fst/fst.c'] + obj.use += [ 'vstwin' ] obj.uselib += ['GDI32'] if bld.is_defined('LXVST_SUPPORT'): @@ -398,14 +412,19 @@ def build(bld): obj.source += [ 'sse_functions_xmm.cc', 'sse_functions.s' ] elif bld.env['build_target'] == 'x86_64': obj.source += [ 'sse_functions_xmm.cc', 'sse_functions_64bit.s' ] + elif bld.env['build_target'] == 'mingw': + # usability of the 64 bit windows assembler depends on the compiler target, + # not the build host, which in turn can only be inferred from the name + # of the compiler. + if re.search ('/^x86_64/', str(bld.env['CC'])): + obj.source += [ 'sse_functions_xmm.cc', 'sse_functions_64bit_win.s' ] # i18n if bld.is_defined('ENABLE_NLS'): mo_files = bld.path.ant_glob('po/*.mo') for mo in mo_files: lang = os.path.basename(mo.srcpath()).replace('.mo', '') - bld.install_as(os.path.join(bld.env['PREFIX'], 'share', 'locale', - lang, 'LC_MESSAGES', I18N_PACKAGE + '.mo'), + bld.install_as(os.path.join(bld.env['LOCALEDIR'], lang, 'LC_MESSAGES', I18N_PACKAGE + str(bld.env['MAJOR']) + '.mo'), mo) if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'): @@ -414,20 +433,20 @@ def build(bld): testcommon = bld(features = 'cxx') testcommon.includes = obj.includes + ['test', '../pbd', '..'] 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'] + 'test/dummy_lxvst.cc', 'test/audio_region_test.cc', 'test/test_util.cc', 'test/test_ui.cc'] testcommon.uselib = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD', 'SAMPLERATE','XML','LRDF','COREAUDIO','TAGLIB','VAMPSDK','VAMPHOSTSDK','RUBBERBAND'] testcommon.use = ['libpbd','libmidipp','libevoral', - 'libaudiographer','ardour'] + 'libaudiographer','libardour'] if bld.is_defined('USE_EXTERNAL_LIBS'): testcommon.uselib.extend(['LIBLTC',]) else: testcommon.use.extend(['libltc', 'librubberband']) testcommon.defines = [ + 'PACKAGE="libardour' + str(bld.env['MAJOR']) + 'test"', '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') + '"', + 'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"', ] testcommon.name = 'testcommon' @@ -498,16 +517,15 @@ def build(bld): session_load_tester.includes.append ('test') session_load_tester.uselib = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD', 'SAMPLERATE','XML','LRDF','COREAUDIO'] - session_load_tester.use = ['libpbd','libmidipp','ardour'] + 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"', + 'PACKAGE="libardour' + str(bld.env['MAJOR']) + 'profile"', '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') + '"', + 'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"', ] if bld.env['FPU_OPTIMIZATION']: session_load_tester.source += [ 'sse_functions_xmm.cc' ] @@ -531,16 +549,15 @@ def build(bld): profilingobj.includes.append ('test') profilingobj.uselib = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD', 'SAMPLERATE','XML','LRDF','COREAUDIO'] - profilingobj.use = ['libpbd','libmidipp','ardour'] + profilingobj.use = ['libpbd','libmidipp','libardour'] profilingobj.name = 'libardour-profiling' profilingobj.target = p profilingobj.install_path = '' profilingobj.defines = [ - 'PACKAGE="libardour3profile"', + 'PACKAGE="libardour' + str(bld.env['MAJOR']) + 'profile"', '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') + '"', + 'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"', ] if bld.env['FPU_OPTIMIZATION']: profilingobj.source += [ 'sse_functions_xmm.cc' ] @@ -557,7 +574,7 @@ def create_ardour_test_program(bld, includes, name, target, sources): testobj.uselib = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD', 'SAMPLERATE','XML','LRDF','COREAUDIO','TAGLIB','VAMPSDK','VAMPHOSTSDK','RUBBERBAND'] testobj.use = ['libpbd','libmidipp','libevoral', - 'libaudiographer','ardour','testcommon'] + 'libaudiographer','libardour','testcommon'] if bld.is_defined('USE_EXTERNAL_LIBS'): testobj.uselib.extend(['LIBLTC']) else: @@ -566,30 +583,29 @@ def create_ardour_test_program(bld, includes, name, target, sources): testobj.name = name testobj.target = target # not sure about install path - testobj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') + testobj.install_path = bld.env['LIBDIR'] testobj.defines = [ - 'PACKAGE="libardour3test"', + 'PACKAGE="libardour' + str(bld.env['MAJOR']) + 'test"', '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') + '"', + 'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"', ] def shutdown(): autowaf.shutdown() def i18n(bld): - autowaf.build_i18n(bld, top, 'libs/ardour', I18N_PACKAGE, libardour_sources, + autowaf.build_i18n(bld, top, 'libs/ardour', I18N_PACKAGE + str(bld.env['MAJOR']), libardour_sources, 'Paul Davis') def i18n_pot(bld): - autowaf.build_i18n(bld, top, 'libs/ardour', I18N_PACKAGE, libardour_sources, + autowaf.build_i18n(bld, top, 'libs/ardour', I18N_PACKAGE + str(bld.env['MAJOR']), libardour_sources, 'Paul Davis') def i18n_po(bld): - autowaf.build_i18n_po(bld, top, 'libs/ardour', I18N_PACKAGE, libardour_sources, + autowaf.build_i18n_po(bld, top, 'libs/ardour', I18N_PACKAGE + str(bld.env['MAJOR']), libardour_sources, 'Paul Davis') def i18n_mo(bld): - autowaf.build_i18n_mo(bld, top, 'libs/ardour', I18N_PACKAGE, libardour_sources, + autowaf.build_i18n_mo(bld, top, 'libs/ardour', I18N_PACKAGE + str(bld.env['MAJOR']), libardour_sources, 'Paul Davis')