X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fwscript;h=a3ec926485893087ccd200002332f137fb3d5411;hb=2d5166606b2b18bda0dbe615cc07759c5a1263e2;hp=10ee3a7dbd82769ce08e49f01a96639b47a5e40a;hpb=b8419ae7cdf55c4bce8a0ce9b102c2edd6dd0d1f;p=ardour.git diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 10ee3a7dbd..a3ec926485 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -8,11 +8,9 @@ import subprocess import sys # default state file version for this build -CURRENT_SESSION_FILE_VERSION = 3001 +CURRENT_SESSION_FILE_VERSION = 3002 -# Variables for 'waf dist' -APPNAME = 'libardour3' -I18N_PACKAGE = 'ardour3' +I18N_PACKAGE = 'ardour' # Mandatory variables top = '.' @@ -23,7 +21,9 @@ path_prefix = 'libs/ardour/' libardour_sources = [ 'amp.cc', 'analyser.cc', + 'analysis_graph.cc', 'async_midi_port.cc', + 'audio_backend.cc', 'audio_buffer.cc', 'audio_diskstream.cc', 'audio_library.cc', @@ -46,7 +46,6 @@ libardour_sources = [ 'automation_control.cc', 'automation_list.cc', 'automation_watch.cc', - 'backend_search_path.cc', 'beats_frames_converter.cc', 'broadcast_info.cc', 'buffer.cc', @@ -57,17 +56,20 @@ libardour_sources = [ 'capturing_processor.cc', 'chan_count.cc', 'chan_mapping.cc', - 'configuration.cc', 'config_text.cc', + 'controllable_descriptor.cc', + 'control_group.cc', 'control_protocol_manager.cc', - 'control_protocol_search_path.cc', 'cycle_timer.cc', 'data_type.cc', 'default_click.cc', 'debug.cc', + 'delayline.cc', 'delivery.cc', 'directory_names.cc', 'diskstream.cc', + 'dsp_filter.cc', + 'ebur128_analysis.cc', 'element_import_handler.cc', 'element_importer.cc', 'engine_slave.cc', @@ -81,7 +83,6 @@ libardour_sources = [ 'export_format_manager.cc', 'export_format_specification.cc', 'export_formats.cc', - 'export_formats_search_path.cc', 'export_graph_builder.cc', 'export_handler.cc', 'export_preset.cc', @@ -93,6 +94,9 @@ libardour_sources = [ 'filesystem_paths.cc', 'filter.cc', 'find_session.cc', + 'fixed_delay.cc', + 'fluid_synth.cc', + 'gain_control.cc', 'globals.cc', 'graph.cc', 'graphnode.cc', @@ -107,45 +111,56 @@ libardour_sources = [ 'io_processor.cc', 'kmeterdsp.cc', 'ladspa_plugin.cc', - 'ladspa_search_path.cc', + 'legatize.cc', 'location.cc', 'location_importer.cc', + 'ltc_file_reader.cc', 'ltc_slave.cc', - 'lv2_bundled_search_path.cc', + 'lua_api.cc', + 'luabindings.cc', + 'luaproc.cc', + 'luascripting.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', 'midi_patch_manager.cc', - 'midi_patch_search_path.cc', 'midi_playlist.cc', 'midi_playlist_source.cc', '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', 'midi_track.cc', 'midi_ui.cc', + 'mididm.cc', 'midiport_manager.cc', 'mix.cc', + 'monitor_control.cc', 'monitor_processor.cc', 'mtc_slave.cc', 'mtdm.cc', + 'muteable.cc', + 'mute_control.cc', 'mute_master.cc', + 'note_fixer.cc', 'onset_detector.cc', 'operations.cc', 'pan_controllable.cc', 'pannable.cc', 'panner.cc', 'panner_manager.cc', - 'panner_search_path.cc', 'panner_shell.cc', + 'parameter_descriptor.cc', 'pcm_utils.cc', - 'pi_controller.cc', + 'phase_control.cc', 'playlist.cc', 'playlist_factory.cc', 'playlist_source.cc', @@ -156,12 +171,15 @@ libardour_sources = [ 'port_insert.cc', 'port_manager.cc', 'port_set.cc', + 'presentation_info.cc', 'process_thread.cc', 'processor.cc', 'progress.cc', 'quantize.cc', 'rc_configuration.cc', 'recent_sessions.cc', + 'record_enable_control.cc', + 'record_safe_control.cc', 'region_factory.cc', 'resampled_source.cc', 'region.cc', @@ -172,6 +190,8 @@ libardour_sources = [ 'route_group.cc', 'route_group_member.cc', 'rb_effect.cc', + 'scene_change.cc', + 'search_paths.cc', 'send.cc', 'session.cc', 'session_butler.cc', @@ -193,16 +213,25 @@ libardour_sources = [ 'session_state_utils.cc', 'session_time.cc', 'session_transport.cc', + 'sidechain.cc', 'slave.cc', + 'slavable.cc', + 'slavable_automation_control.cc', 'smf_source.cc', 'sndfile_helpers.cc', 'sndfileimportable.cc', 'sndfilesource.cc', + 'solo_control.cc', + 'solo_isolate_control.cc', + 'solo_safe_control.cc', + 'soundcloud_upload.cc', 'source.cc', 'source_factory.cc', 'speakers.cc', 'srcfilesource.cc', + 'stripable.cc', 'strip_silence.cc', + 'system_exec.cc', 'revision.cc', 'tape_file_matcher.cc', 'template_utils.cc', @@ -212,11 +241,13 @@ libardour_sources = [ 'ticker.cc', 'track.cc', 'transient_detector.cc', + 'transform.cc', + 'transpose.cc', 'unknown_processor.cc', 'user_bundle.cc', 'utils.cc', - 'version.cc', - 'vst_search_path.cc', + 'vca.cc', + 'vca_manager.cc', 'vumeterdsp.cc', 'worker.cc' ] @@ -242,11 +273,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') @@ -254,8 +280,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', @@ -266,8 +293,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', @@ -276,12 +305,20 @@ 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) + # non-standard LV2 extention -- TODO: add option to disable?? + if conf.is_defined ('HAVE_LV2_1_10_0'): + conf.define ('LV2_EXTENDED', 1) + # autowaf.check_pkg(conf, 'soundtouch-1.0', uselib_store='SOUNDTOUCH', # mandatory=False) autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', @@ -294,7 +331,7 @@ def configure(conf): # controls whether we actually use it in preference to soundtouch # Note: as of 2104, soundtouch (WSOLA) has been out-of-use for years. - conf.define('USE_RUBBERBAND', 1) + conf.define('USE_RUBBERBAND', 1) conf.define('CURRENT_SESSION_FILE_VERSION', CURRENT_SESSION_FILE_VERSION) @@ -315,6 +352,11 @@ def configure(conf): autowaf.check_header(conf, 'cxx', 'boost/weak_ptr.hpp') autowaf.check_header(conf, 'cxx', 'boost/scoped_ptr.hpp') autowaf.check_header(conf, 'cxx', 'boost/ptr_container/ptr_list.hpp') + if conf.env['WINDOWS_VST_SUPPORT'] == True and Options.options.dist_target == 'mingw': + conf.check(compiler='cxx', + lib='gdi32', + mandatory=True, + uselib_store='GDI32') def build(bld): @@ -324,41 +366,49 @@ def build(bld): # micro increment <=> no interface changes LIBARDOUR_LIB_VERSION = "3.0.0" + # operate on copy to avoid adding sources twice + sources = list(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.cxxflags = [ '-fPIC' ] - obj.cflags = [ '-fPIC' ] + obj = bld.stlib(features = 'c cxx cstlib cxxstlib', source=sources) + obj.cxxflags = [ bld.env['compiler_flags_dict']['pic'] ] + obj.cflags = [ bld.env['compiler_flags_dict']['pic'] ] obj.defines = [] obj.export_includes = ['.'] obj.includes = ['.', '../surfaces/control_protocol', '..'] obj.name = 'libardour' obj.target = 'ardour' - obj.uselib = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID', - 'SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS', - 'OSX','BOOST','CURL','DL','TAGLIB','VAMPSDK','VAMPHOSTSDK','RUBBERBAND'] + obj.uselib = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID', 'LO', + 'SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS', 'GIOMM', + 'OSX','BOOST','CURL','TAGLIB','VAMPSDK','VAMPHOSTSDK','RUBBERBAND'] obj.use = ['libpbd','libmidipp','libevoral', - 'libaudiographer', + 'libaudiographer', 'libtimecode', + 'liblua', ] + if bld.env['build_target'] != 'mingw': + obj.uselib += ['DL'] if bld.is_defined('USE_EXTERNAL_LIBS'): - obj.uselib.extend(['VAMPSDK', 'LIBLTC']) + obj.uselib.extend(['VAMPSDK', 'LIBLTC', 'LIBFLUIDSYNTH']) else: - obj.use.extend(['librubberband', 'libltc_includes', 'libltc']) + obj.use.extend(['librubberband', 'libltc_includes', 'libltc', 'libfluidsynth_includes', 'libfluidsynth']) 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') + '"', - 'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"', + 'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"', + 'LIBARDOUR="' + bld.env['lwrcase_dirname'] + '"', 'EVORAL_MIDI_XML=1', ] @@ -367,7 +417,7 @@ def build(bld): #obj.add_objects = 'default/libs/surfaces/control_protocol/smpte_1.o' if bld.is_defined('HAVE_LILV') : - obj.source += ['lv2_plugin.cc', 'lv2_evbuf.c', 'uri_map.cc'] + obj.source += ['lv2_plugin.cc', 'lv2_evbuf.c', 'uri_map.cc'] obj.uselib += ['LILV'] if bld.is_defined('HAVE_SUIL'): obj.uselib += ['SUIL'] @@ -377,7 +427,8 @@ def build(bld): obj.includes += [ '../fst' ] obj.defines += [ 'WINDOWS_VST_SUPPORT' ] if bld.env['build_target'] == 'mingw': - obj.source += [ '../fst/vstwin.c'] + obj.use += [ 'vstwin' ] + obj.uselib += ['GDI32'] if bld.is_defined('LXVST_SUPPORT'): obj.source += [ 'lxvst_plugin.cc', 'linux_vst_support.cc' ] @@ -393,19 +444,46 @@ def build(bld): if bld.is_defined('AUDIOUNIT_SUPPORT'): obj.source += [ 'audio_unit.cc' ] + avx_sources = [] + if Options.options.fpu_optimization: if (bld.env['build_target'] == 'i386' or bld.env['build_target'] == 'i686'): - obj.source += [ 'sse_functions_xmm.cc', 'sse_functions.s' ] + obj.source += [ 'sse_functions_xmm.cc', 'sse_functions.s', ] + avx_sources = [ 'sse_functions_avx_linux.cc' ] elif bld.env['build_target'] == 'x86_64': - obj.source += [ 'sse_functions_xmm.cc', 'sse_functions_64bit.s' ] + obj.source += [ 'sse_functions_xmm.cc', 'sse_functions_64bit.s', ] + avx_sources = [ 'sse_functions_avx_linux.cc' ] + 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-w64', str(bld.env['CC'])): + obj.source += [ 'sse_functions_xmm.cc' ] + obj.source += [ 'sse_functions_64bit_win.s', 'sse_avx_functions_64bit_win.s' ] + avx_sources = [ 'sse_functions_avx.cc' ] + + if avx_sources: + # as long as we want to use AVX intrinsics in this file, + # compile it with -mavx flag - append avx flag to the existing + avx_cxxflags = list(bld.env['CXXFLAGS']) + avx_cxxflags.append (bld.env['compiler_flags_dict']['avx']) + avx_cxxflags.append (bld.env['compiler_flags_dict']['pic']) + bld(features = 'cxx', + source = avx_sources, + cxxflags = avx_cxxflags, + includes = [ '.' ], + use = [ 'libtimecode', 'libpbd', 'libevoral', 'liblua' ], + uselib = [ 'GLIBMM', 'XML' ], + target = 'sse_avx_functions') + + obj.use += ['sse_avx_functions' ] # 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,31 +492,23 @@ 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',]) + testcommon.uselib.extend(['LIBLTC', 'LIBFLUIDSYNTH']) else: - testcommon.use.extend(['libltc', 'librubberband']) + testcommon.use.extend(['libltc', 'librubberband', 'libfluidsynth']) 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' - if bld.env['FPU_OPTIMIZATION']: - testcommon.source += [ 'sse_functions_xmm.cc' ] - if (bld.env['build_target'] == 'i386' - or bld.env['build_target'] == 'i686'): - testcommon.source += [ 'sse_functions.s' ] - elif bld.env['build_target'] == 'x86_64': - testcommon.source += [ 'sse_functions_64bit.s' ] - if bld.env['SINGLE_TESTS']: create_ardour_test_program(bld, obj.includes, 'audio_engine_test', 'test_audio_engine', ['test/audio_engine_test.cc']) create_ardour_test_program(bld, obj.includes, 'automation_list_property_test', 'test_automation_list_property', ['test/automation_list_property_test.cc']) @@ -456,12 +526,15 @@ def build(bld): create_ardour_test_program(bld, obj.includes, 'region_naming', 'test_region_naming', ['test/region_naming_test.cc']) create_ardour_test_program(bld, obj.includes, 'control_surface', 'test_control_surfaces', ['test/control_surfaces_test.cc']) create_ardour_test_program(bld, obj.includes, 'mtdm_test', 'test_mtdm', ['test/mtdm_test.cc']) + create_ardour_test_program(bld, obj.includes, 'sha1_test', 'test_sha1', ['test/sha1_test.cc']) create_ardour_test_program(bld, obj.includes, 'session_test', 'test_session', ['test/session_test.cc']) + create_ardour_test_program(bld, obj.includes, 'dsp_load_calculator_test', 'test_dsp_load_calculator', ['test/dsp_load_calculator_test.cc']) test_sources = ''' test/audio_engine_test.cc test/automation_list_property_test.cc test/bbt_test.cc + test/dsp_load_calculator_test.cc test/tempo_test.cc test/interpolation_test.cc test/midi_clock_slave_test.cc @@ -475,6 +548,7 @@ def build(bld): test/region_naming_test.cc test/control_surfaces_test.cc test/mtdm_test.cc + test/sha1_test.cc test/session_test.cc '''.split() @@ -486,36 +560,29 @@ def build(bld): create_ardour_test_program(bld, obj.includes, 'libardour-tests', 'run-tests', test_sources) - # Tester to just load a session - session_load_tester = bld(features = 'cxx cxxprogram') - session_load_tester.source = ''' + # Utility to load and save a session + load_save_session = bld(features = 'cxx cxxprogram') + load_save_session.source = ''' test/test_util.cc - test/load_session.cc + test/test_ui.cc + test/load_save_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','GLIBMM','GTHREAD', + load_save_session.includes = obj.includes + load_save_session.includes.append ('test') + load_save_session.uselib = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD', 'SAMPLERATE','XML','LRDF','COREAUDIO'] - session_load_tester.use = ['libpbd','libmidipp','ardour'] - 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"', + load_save_session.use = ['libpbd','libmidipp','libardour'] + load_save_session.name = 'libardour-load-save-session' + load_save_session.target = 'load-save-session' + load_save_session.install_path = '' + load_save_session.defines = [ + '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' ] - if (bld.env['build_target'] == 'i386' - or bld.env['build_target'] == 'i686'): - session_load_tester.source += [ 'sse_functions.s' ] - elif bld.env['build_target'] == 'x86_64': - session_load_tester.source += [ 'sse_functions_64bit.s' ] # Profiling for p in ['runpc', 'lots_of_regions', 'load_session']: @@ -531,24 +598,16 @@ 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' ] - 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 create_ardour_test_program(bld, includes, name, target, sources): testobj = bld(features = 'cxx cxxprogram') @@ -557,39 +616,38 @@ 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']) + testobj.uselib.extend(['LIBLTC', 'LIBFLUIDSYNTH']) else: - testobj.use.extend(['libltc']) + testobj.use.extend(['libltc', 'libfluidsynth']) 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')