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

diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index 6c4764a738..52943dd8fd 100644
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -6,20 +6,23 @@ 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
 # 
 
-domain = 'libardour'
+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")
+ardour.Append(CXXFLAGS=["-DLIBSIGC_DISABLE_DEPRECATED", "-DGLIBMM_EXCEPTIONS_ENABLED"])
 ardour.Append(PACKAGE = domain)
 ardour.Append(POTFILE = domain + '.pot')
 
+if ardour['IS_OSX']:
+	ardour.Append (LINKFLAGS="-Xlinker -headerpad -Xlinker 2048")
+
 #
 # explicitly reference the control protocol LGPL library for includes
 # 
@@ -27,68 +30,118 @@ ardour.Append(POTFILE = domain + '.pot')
 ardour.Append(CPPPATH = '#libs/surfaces/control_protocol')
 
 ardour_files=Split("""
-bundle.cc
-chan_count.cc
-diskstream.cc
-directory_names.cc
-filename_extensions.cc
-find_session.cc
-track.cc
+amp.cc
+analyser.cc
+audio_buffer.cc
 audio_diskstream.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
-port.cc
-audio_port.cc
-midi_port.cc
-port_set.cc
-buffer.cc
-buffer_set.cc
-meter.cc
-amp.cc
-panner.cc
+audiofile_tagger.cc
 audiofilesource.cc
-audiofilter.cc
 audioregion.cc
 audiosource.cc
-midi_source.cc
-midi_diskstream.cc
-midi_playlist.cc
-midi_track.cc
-midi_region.cc
-midi_model.cc
-smf_source.cc
 auditioner.cc
+automatable.cc
 automation.cc
-automation_event.cc
+automation_control.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
+find_session.cc
 gain.cc
 gdither.cc
 globals.cc
 import.cc
-insert.cc
 io.cc
+io_processor.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
+onset_detector.cc
+panner.cc
 pcm_utils.cc
 playlist.cc
 playlist_factory.cc
 plugin.cc
+plugin_insert.cc
 plugin_manager.cc
+port.cc
+port_insert.cc
+port_set.cc
+processor.cc
+quantize.cc
+rc_configuration.cc
 recent_sessions.cc
-redirect.cc
 region.cc
 region_factory.cc
+resampled_source.cc
+return.cc
 reverse.cc
 route.cc
 route_group.cc
@@ -97,45 +150,59 @@ 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
+session_state_utils.cc
 session_time.cc
-session_timefx.cc
 session_transport.cc
 session_utils.cc
-silentfilesource.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
 utils.cc
 version.cc
-mix.cc
 """)
 
 arch_specific_objects = [ ]
 
-osc_files = [ 'osc.cc' ]
 vst_files = [ 'vst_plugin.cc', 'session_vst.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 = [ ]
 
 if ardour['VST']:
 	extra_sources += vst_files
 	ardour.Append(CCFLAGS="-DVST_SUPPORT", CPPPATH="#libs/fst")
 
-if ardour['LIBLO']:
-    extra_sources += osc_files
+if ardour['LV2']:
+	extra_sources += lv2_files
+	ardour.Append(CCFLAGS="-DHAVE_SLV2")
 
 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']) + "\\\"")
+ardour.Append(CXXFLAGS="-DVAMP_DIR=\\\"" + os.path.join (final_prefix, env['LIBDIR'], 'ardour3', 'vamp') + "\\\"")
 ardour.Append(CXXFLAGS="-DCONFIG_DIR=\\\"" + final_config_prefix + "\\\"")
 ardour.Append(CXXFLAGS="-DLOCALEDIR=\\\"" + os.path.join (final_prefix, 'share', 'locale') + "\\\"")
 
@@ -193,32 +260,30 @@ def CheckJackVideoFrameOffset(context):
 	context.Result(result)
 	return result
 
+
 #
-# See if JACK supports jack_port_ensure_monitor_input()
+# See if JACK supports jack_recompute_total_latency() (single port version)
 #
-jack_ensure_monitor_input_test = """
+
+jack_port_latency_test = """
 #include <jack/jack.h>
-int main(int argc, char** argv)
+int main(int argc, char **argv)
 {
-	    jack_port_t **port;
-
-	    jack_port_ensure_monitor (*port, 1);
-	    return 0;
-
+    jack_recompute_total_latency ((jack_client_t*) 0, (jack_port_t*) 0);
+    return 0;
 }
 """
-
-def CheckJackEnsureMonitorInput(context):
-        context.Message('Checking for jack_port_ensure_monitor_input()...')
-        result = context.TryLink(jack_ensure_monitor_input_test, '.c')
+def CheckJackRecomputeLatency(context):
+        context.Message('Checking for jack_recompute_total_latency()...')
+        result = context.TryLink(jack_port_latency_test, '.c')
         context.Result(result)
         return result
 
 conf = Configure(ardour, custom_tests = {
 	'CheckJackClientOpen' : CheckJackClientOpen,
 	'CheckJackRecomputeLatencies' : CheckJackRecomputeLatencies,
-	'CheckJackVideoFrameOffset' : CheckJackVideoFrameOffset,
-	'CheckJackEnsureMonitorInput' : CheckJackEnsureMonitorInput
+	'CheckJackRecomputeLatency' : CheckJackRecomputeLatency,
+	'CheckJackVideoFrameOffset' : CheckJackVideoFrameOffset
 })
 
 if conf.CheckJackClientOpen():
@@ -227,13 +292,11 @@ if conf.CheckJackClientOpen():
 if conf.CheckJackRecomputeLatencies():
     ardour.Append(CXXFLAGS="-DHAVE_JACK_RECOMPUTE_LATENCIES")
 
+if conf.CheckJackRecomputeLatency():
+    ardour.Append(CXXFLAGS="-DHAVE_JACK_RECOMPUTE_LATENCY")
+
 if conf.CheckJackVideoFrameOffset():
 	ardour.Append(CXXFLAGS="-DHAVE_JACK_VIDEO_SUPPORT")
-	
-if conf.CheckJackEnsureMonitorInput():
-	ardour.Append(CXXFLAGS='-DHAVE_JACK_PORT_ENSURE_MONITOR')
-else:
-    print '\nWARNING: You need at least svn revision 985 of jack for hardware monitoring to work correctly.\n'
 
 #
 # Optional header files
@@ -273,29 +336,42 @@ ardour = conf.Finish ()
 
 ardour.Merge ([
 	     libraries['core'],
-	     libraries['xml'],
-	     libraries['sndfile-ardour'],
-	     libraries['raptor'],
+	     libraries['fftw3'],
+	     libraries['fftw3f'],
+	     libraries['glib2'],
+	     libraries['glibmm2'],
 	     libraries['lrdf'],
+	     libraries['midi++2'],
+	     libraries['evoral'],
+	     libraries['smf'],
+	     libraries['pbd'],
+	     libraries['raptor'],
 	     libraries['samplerate'],
 	     libraries['sigc2'],
-	     libraries['pbd'],
-	     libraries['soundtouch'],
-	     libraries['midi++2'],
-	     libraries['glib2'],
-	     libraries['glibmm2']
+	     libraries['sndfile'],
+	     libraries['taglib'],
+	     libraries['vamp'],
+	     libraries['vamphost'],
+	     libraries['xml']
 	     ])
 
-if ardour['LIBLO']:
-    ardour.Merge ([ libraries['lo'] ])
+if ardour['RUBBERBAND']:
+	ardour.Merge ([ libraries['rubberband']])
+	timefx_sources += [ 'rb_effect.cc' ]
+else:
+	ardour.Merge ([ libraries['soundtouch'] ])
+	timefx_sources += [ 'st_stretch.cc', 'st_pitch.cc' ]
+	
+if ardour['LV2']:
+	ardour.Merge ([ libraries['slv2'] ])
 
 if ardour['COREAUDIO'] or ardour['AUDIOUNITS']:
-    ardour.Merge ([ libraries['appleutility'] ])
+	ardour.Merge ([ libraries['appleutility'] ])
 
 def SharedAsmObjectEmitter(target, source, env):
-    for tgt in target:
-        tgt.attributes.shared = 1
-    return (target, source)
+	for tgt in target:
+		tgt.attributes.shared = 1
+	return (target, source)
 
 
 env['BUILDERS']['SharedAsmObject'] = Builder (action = '$CXX -c -fPIC $SOURCE -o $TARGET',
@@ -311,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']:
@@ -325,19 +401,25 @@ if env['FPU_OPTIMIZATION']:
 		arch_specific_objects = env.SharedAsmObject('sse_functions_64bit.os', 'sse_functions_64bit.s')
 		always_sse_objects += [ sse_env.SharedObject (source = 'sse_functions_xmm.cc') ]
 			
-libardour = ardour.SharedLibrary('ardour', ardour_files + always_sse_objects + extra_sources + arch_specific_objects)
+libardour = ardour.SharedLibrary('ardour', ardour_files + always_sse_objects + timefx_sources + extra_sources + arch_specific_objects)
 
 Default(libardour)
 
 if env['NLS']:
-	i18n (ardour, ardour_files + vst_files + coreaudio_files + audiounit_files, env)
+	i18n (ardour, ardour_files + vst_files + coreaudio_files + timefx_sources + audiounit_files, env)
 
 
-env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libardour))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libardour))
 
 env.Alias('version', ardour.VersionBuild(['version.cc', 'ardour/version.h'], []))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
-				     [ 'SConscript', 'i18n.h', 'gettext.h', 'sse_functions_xmm.cc', 'sse_functions.s', 'sse_functions_64bit.s' ] +
-				     ardour_files + osc_files + vst_files + coreaudio_files + audiounit_files +
+				     [ 'SConscript', 'i18n.h', 'gettext.h' ] + 
+				     [ 'sse_functions_xmm.cc', 'sse_functions.s', 'sse_functions_64bit.s' ] +
+				     [ 'rb_effect.cc', 'st_stretch.cc', 'st_pitch.cc' ] +
+				     ardour_files + 
+				     vst_files + 
+				     coreaudio_files + 
+				     audiounit_files +
+				     lv2_files +
 				     glob.glob('po/*.po') + glob.glob('ardour/*.h')))