X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2FSConscript;h=52943dd8fd035a98c27bb8ba4e91ac0fa08f06c2;hb=f233c4738cf671a1957bb3729654b80a6f30cbbb;hp=4c13c82cf7e54881186546bb5a322a3e67507997;hpb=4d94305cc904cc2cce33d62050f351fe80f0d517;p=ardour.git

diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index 4c13c82cf7..52943dd8fd 100644
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -6,7 +6,7 @@ import glob
 
 Import('env final_prefix install_prefix final_config_prefix libraries i18n')
 
-ardour = env.Copy()
+ardour = env.Clone()
 
 #
 # this defines the version number of libardour
@@ -14,7 +14,7 @@ ardour = env.Copy()
 
 domain = 'libardour3'
 
-ardour.Append(DOMAIN = domain, MAJOR = 2, MINOR = 0, MICRO = 0)
+ardour.Append(DOMAIN = domain, MAJOR = 3, MINOR = 0, MICRO = 0)
 ardour.Append(CXXFLAGS = "-DPACKAGE=\\\"" + domain + "\\\"")
 ardour.Append(CXXFLAGS=["-DLIBSIGC_DISABLE_DEPRECATED", "-DGLIBMM_EXCEPTIONS_ENABLED"])
 ardour.Append(PACKAGE = domain)
@@ -32,38 +32,62 @@ ardour.Append(CPPPATH = '#libs/surfaces/control_protocol')
 ardour_files=Split("""
 amp.cc
 analyser.cc
-audioanalyser.cc
 audio_buffer.cc
 audio_diskstream.cc
-audioengine.cc
-audiofilesource.cc
 audio_library.cc
 audio_playlist.cc
+audio_playlist_importer.cc
 audio_port.cc
+audio_region_importer.cc
+audio_track.cc
+audio_track_importer.cc
+audioanalyser.cc
+audioengine.cc
+audiofile_tagger.cc
+audiofilesource.cc
 audioregion.cc
 audiosource.cc
-audio_track.cc
 auditioner.cc
-auto_bundle.cc
 automatable.cc
 automation.cc
 automation_control.cc
-automation_event.cc
-base_audio_port.cc
-base_midi_port.cc
+automation_list.cc
+beats_frames_converter.cc
+broadcast_info.cc
 buffer.cc
 buffer_set.cc
+bundle.cc
 chan_count.cc
+chan_mapping.cc
 configuration.cc
 control_protocol_manager.cc
 control_protocol_search_path.cc
 crossfade.cc
-curve.cc
 cycle_timer.cc
 default_click.cc
+delivery.cc
 directory_names.cc
 diskstream.cc
+element_import_handler.cc
+element_importer.cc
 enums.cc
+event_type_map.cc
+export_channel.cc
+export_channel_configuration.cc
+export_file_io.cc
+export_filename.cc
+export_format_base.cc
+export_format_manager.cc
+export_format_specification.cc
+export_formats.cc
+export_handler.cc
+export_preset.cc
+export_processor.cc
+export_profile_manager.cc
+export_status.cc
+export_timespan.cc
+export_utilities.cc
+file_source.cc
 filename_extensions.cc
 filesystem_paths.cc
 filter.cc
@@ -74,28 +98,33 @@ globals.cc
 import.cc
 io.cc
 io_processor.cc
-jack_audio_port.cc
-jack_midi_port.cc
-jack_port.cc
+internal_send.cc
+internal_return.cc
+interpolation.cc
 jack_slave.cc
 ladspa_plugin.cc
 location.cc
+location_importer.cc
 meter.cc
 midi_buffer.cc
+midi_clock_slave.cc
 midi_diskstream.cc
 midi_model.cc
+midi_patch_manager.cc
 midi_playlist.cc
 midi_port.cc
 midi_region.cc
+midi_ring_buffer.cc
 midi_source.cc
+midi_state_tracker.cc
 midi_stretch.cc
 midi_track.cc
 mix.cc
 mtc_slave.cc
+mute_master.cc
 named_selection.cc
-note.cc
+onset_detector.cc
 panner.cc
-parameter.cc
 pcm_utils.cc
 playlist.cc
 playlist_factory.cc
@@ -107,21 +136,25 @@ port_insert.cc
 port_set.cc
 processor.cc
 quantize.cc
+rc_configuration.cc
 recent_sessions.cc
 region.cc
 region_factory.cc
 resampled_source.cc
+return.cc
 reverse.cc
 route.cc
 route_group.cc
 send.cc
-session_butler.cc
 session.cc
+session_butler.cc
 session_click.cc
 session_command.cc
+session_configuration.cc
 session_directory.cc
 session_events.cc
 session_export.cc
+session_metadata.cc
 session_midi.cc
 session_process.cc
 session_state.cc
@@ -129,16 +162,19 @@ session_state_utils.cc
 session_time.cc
 session_transport.cc
 session_utils.cc
-silentfilesource.cc
-smf_reader.cc
 smf_source.cc
 sndfile_helpers.cc
+sndfileimportable.cc
 sndfilesource.cc
 source.cc
 source_factory.cc
+strip_silence.cc
+svn_revision.cc
 tape_file_matcher.cc
 template_utils.cc
 tempo.cc
+tempo_map_importer.cc
+ticker.cc
 track.cc
 transient_detector.cc
 user_bundle.cc
@@ -148,11 +184,10 @@ version.cc
 
 arch_specific_objects = [ ]
 
-osc_files = [ 'osc.cc' ]
 vst_files = [ 'vst_plugin.cc', 'session_vst.cc' ]
-lv2_files = [ 'lv2_plugin.cc' ]
+lv2_files = [ 'lv2_plugin.cc', 'lv2_event_buffer.cc', 'uri_map.cc' ]
 audiounit_files = [ 'audio_unit.cc' ]
-coreaudio_files = [ 'coreaudiosource.cc' ]
+coreaudio_files = [ 'coreaudiosource.cc', 'caimportable.cc' ]
 extra_sources = [ ]
 timefx_sources = [ ]
 
@@ -164,9 +199,6 @@ if ardour['LV2']:
 	extra_sources += lv2_files
 	ardour.Append(CCFLAGS="-DHAVE_SLV2")
 
-if ardour['LIBLO']:
-    extra_sources += osc_files
-
 ardour.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
 ardour.Append(CXXFLAGS="-DDATA_DIR=\\\"" + os.path.join (final_prefix, 'share') + "\\\"")
 ardour.Append(CXXFLAGS="-DMODULE_DIR=\\\"" + os.path.join (final_prefix, env['LIBDIR']) + "\\\"")
@@ -310,11 +342,14 @@ ardour.Merge ([
 	     libraries['glibmm2'],
 	     libraries['lrdf'],
 	     libraries['midi++2'],
+	     libraries['evoral'],
+	     libraries['smf'],
 	     libraries['pbd'],
 	     libraries['raptor'],
 	     libraries['samplerate'],
 	     libraries['sigc2'],
-	     libraries['sndfile-ardour'],
+	     libraries['sndfile'],
+	     libraries['taglib'],
 	     libraries['vamp'],
 	     libraries['vamphost'],
 	     libraries['xml']
@@ -330,9 +365,6 @@ else:
 if ardour['LV2']:
 	ardour.Merge ([ libraries['slv2'] ])
 
-if ardour['LIBLO']:
-	ardour.Merge ([ libraries['lo'] ])
-
 if ardour['COREAUDIO'] or ardour['AUDIOUNITS']:
 	ardour.Merge ([ libraries['appleutility'] ])
 
@@ -355,7 +387,7 @@ env['BUILDERS']['SharedAsmObject'] = Builder (action = '$CXX -c -fPIC $SOURCE -o
 
 
 always_sse_objects = []
-sse_env = ardour.Copy()
+sse_env = ardour.Clone()
 sse_env.Append (CXXFLAGS="-msse")
 
 if env['FPU_OPTIMIZATION']:
@@ -386,7 +418,6 @@ env.Alias('tarball', env.Distribute (env['DISTTREE'],
 				     [ 'sse_functions_xmm.cc', 'sse_functions.s', 'sse_functions_64bit.s' ] +
 				     [ 'rb_effect.cc', 'st_stretch.cc', 'st_pitch.cc' ] +
 				     ardour_files + 
-				     osc_files + 
 				     vst_files + 
 				     coreaudio_files + 
 				     audiounit_files +