X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fwscript;h=85326e98f8cf2cef164dba85b4e98501df13bc38;hb=f6d29abfc75c460b9e35717f2907e4e61bf38058;hp=56c864ca509cb97b01b3ded6c3f13b74797edad1;hpb=6acdfc69b785841ac10a324484ddd0208612a213;p=ardour.git diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 56c864ca50..85326e98f8 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -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', @@ -60,7 +59,6 @@ libardour_sources = [ 'configuration.cc', 'config_text.cc', 'control_protocol_manager.cc', - 'control_protocol_search_path.cc', 'cycle_timer.cc', 'data_type.cc', 'default_click.cc', @@ -81,7 +79,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', @@ -107,11 +104,9 @@ libardour_sources = [ 'io_processor.cc', 'kmeterdsp.cc', 'ladspa_plugin.cc', - 'ladspa_search_path.cc', 'location.cc', 'location_importer.cc', 'ltc_slave.cc', - 'lv2_bundled_search_path.cc', 'meter.cc', 'midi_automation_list_binder.cc', 'midi_buffer.cc', @@ -119,12 +114,13 @@ libardour_sources = [ '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', @@ -142,10 +138,8 @@ libardour_sources = [ 'pannable.cc', 'panner.cc', 'panner_manager.cc', - 'panner_search_path.cc', 'panner_shell.cc', 'pcm_utils.cc', - 'pi_controller.cc', 'playlist.cc', 'playlist_factory.cc', 'playlist_source.cc', @@ -172,6 +166,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', @@ -198,11 +194,13 @@ libardour_sources = [ 'sndfile_helpers.cc', 'sndfileimportable.cc', 'sndfilesource.cc', + 'soundcloud_upload.cc', 'source.cc', 'source_factory.cc', 'speakers.cc', 'srcfilesource.cc', 'strip_silence.cc', + 'system_exec.cc', 'revision.cc', 'tape_file_matcher.cc', 'template_utils.cc', @@ -293,7 +291,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) @@ -314,6 +312,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): @@ -340,24 +343,25 @@ def build(bld): obj.target = 'ardour' obj.uselib = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID', 'SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS', - 'OSX','BOOST','CURL','DL','TAGLIB','VAMPSDK','VAMPHOSTSDK','RUBBERBAND'] + 'OSX','BOOST','CURL','TAGLIB','VAMPSDK','VAMPHOSTSDK','RUBBERBAND'] obj.use = ['libpbd','libmidipp','libevoral', - 'libaudiographer', + 'libaudiographer', 'libtimecode', ] + if bld.env['build_target'] != 'mingw': + obj.uselib += ['DL'] if bld.is_defined('USE_EXTERNAL_LIBS'): obj.uselib.extend(['VAMPSDK', 'LIBLTC']) else: 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 + '"', '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'] + '"', 'EVORAL_MIDI_XML=1', ] @@ -366,7 +370,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'] @@ -375,13 +379,16 @@ def build(bld): obj.source += [ 'windows_vst_plugin.cc'] obj.includes += [ '../fst' ] obj.defines += [ 'WINDOWS_VST_SUPPORT' ] + if bld.env['build_target'] == 'mingw': + obj.source += [ '../fst/vstwin.c'] + obj.uselib += ['GDI32'] if bld.is_defined('LXVST_SUPPORT'): - obj.source += [ 'lxvst_plugin.cc', 'linux_vst_support.cc', 'linux_vst_info_file.cc' ] + obj.source += [ 'lxvst_plugin.cc', 'linux_vst_support.cc' ] obj.defines += [ 'LXVST_SUPPORT' ] if bld.is_defined('WINDOWS_VST_SUPPORT') or bld.is_defined('LXVST_SUPPORT'): - obj.source += [ 'session_vst.cc', 'vst_plugin.cc' ] + obj.source += [ 'session_vst.cc', 'vst_plugin.cc', 'vst_info_file.cc' ] if bld.is_defined('HAVE_COREAUDIO'): obj.source += [ 'coreaudiosource.cc', 'caimportable.cc' ] @@ -415,7 +422,7 @@ def build(bld): 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: @@ -495,7 +502,7 @@ 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 = '' @@ -528,7 +535,7 @@ 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 = '' @@ -554,7 +561,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: @@ -563,7 +570,7 @@ 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"', 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',