X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2FSConscript;h=6661ea16a2e3d36053d5770f0da0c1ff33690b4b;hb=db718a7f176ae0a90d5304db69a5538ac4293247;hp=4eb50bdc54c88fc53cae20df6ca1f11fc54d054d;hpb=666e0870554705f4fb466fc6b188fe9b4000ca49;p=ardour.git

diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index 4eb50bdc54..6661ea16a2 100644
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -16,8 +16,7 @@ domain = 'libardour'
 
 ardour.Append(DOMAIN = domain, MAJOR = 2, MINOR = 0, MICRO = 0)
 ardour.Append(CXXFLAGS = "-DPACKAGE=\\\"" + domain + "\\\"")
-ardour.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
-ardour.Append(CXXFLAGS="-DGLIBMM_DISABLE_DEPRECATED")
+ardour.Append(CXXFLAGS=["-DLIBSIGC_DISABLE_DEPRECATED", "-DGLIBMM_EXCEPTIONS_ENABLED"])
 ardour.Append(PACKAGE = domain)
 ardour.Append(POTFILE = domain + '.pot')
 
@@ -28,50 +27,84 @@ ardour.Append(POTFILE = domain + '.pot')
 ardour.Append(CPPPATH = '#libs/surfaces/control_protocol')
 
 ardour_files=Split("""
-diskstream.cc
+amp.cc
+audio_buffer.cc
+auto_bundle.cc
+user_bundle.cc
 audio_diskstream.cc
 audio_library.cc
 audio_playlist.cc
-track.cc
+audio_port.cc
 audio_track.cc
 audioengine.cc
 audiofilesource.cc
-audiofilter.cc
 audioregion.cc
 audiosource.cc
 auditioner.cc
+automatable.cc
 automation.cc
+automation_control.cc
 automation_event.cc
+base_audio_port.cc
+base_midi_port.cc
+buffer.cc
+buffer_set.cc
+chan_count.cc
 configuration.cc
-connection.cc
 control_protocol_manager.cc
+control_protocol_search_path.cc
 crossfade.cc
 curve.cc
 cycle_timer.cc
 default_click.cc
+directory_names.cc
+diskstream.cc
 enums.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
+jack_port.cc
+jack_audio_port.cc
+jack_midi_port.cc
 jack_slave.cc
 ladspa_plugin.cc
 location.cc
+meter.cc
+midi_buffer.cc
+midi_diskstream.cc
+midi_model.cc
+midi_playlist.cc
+midi_port.cc
+midi_region.cc
+midi_source.cc
+midi_track.cc
+mix.cc
 mtc_slave.cc
 named_selection.cc
+note.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
 recent_sessions.cc
-redirect.cc
 region.cc
 region_factory.cc
+resampled_source.cc
 reverse.cc
 route.cc
 route_group.cc
@@ -80,23 +113,29 @@ session.cc
 session_butler.cc
 session_click.cc
 session_command.cc
+session_directory.cc
 session_events.cc
 session_export.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
 sndfilesource.cc
 source.cc
 source_factory.cc
+stretch.cc
+tape_file_matcher.cc
+template_utils.cc
 tempo.cc
+track.cc
 utils.cc
 version.cc
-mix.cc
 """)
 
 arch_specific_objects = [ ]
@@ -174,32 +213,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():
@@ -208,13 +245,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