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

diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index 4d68dc7725..6661ea16a2 100644
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -12,11 +12,11 @@ ardour = env.Copy()
 # this defines the version number of libardour
 # 
 
-domain = 'libardour2'
+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=["-DLIBSIGC_DISABLE_DEPRECATED", "-DGLIBMM_EXCEPTIONS_ENABLED"])
 ardour.Append(PACKAGE = domain)
 ardour.Append(POTFILE = domain + '.pot')
 
@@ -29,6 +29,8 @@ ardour.Append(CPPPATH = '#libs/surfaces/control_protocol')
 ardour_files=Split("""
 amp.cc
 audio_buffer.cc
+auto_bundle.cc
+user_bundle.cc
 audio_diskstream.cc
 audio_library.cc
 audio_playlist.cc
@@ -43,9 +45,10 @@ automatable.cc
 automation.cc
 automation_control.cc
 automation_event.cc
+base_audio_port.cc
+base_midi_port.cc
 buffer.cc
 buffer_set.cc
-bundle.cc
 chan_count.cc
 configuration.cc
 control_protocol_manager.cc
@@ -65,8 +68,6 @@ gain.cc
 gdither.cc
 globals.cc
 import.cc
-internal_port.cc
-internal_audio_port.cc
 io.cc
 io_processor.cc
 jack_port.cc
@@ -120,7 +121,6 @@ session_process.cc
 session_state.cc
 session_state_utils.cc
 session_time.cc
-session_timefx.cc
 session_transport.cc
 session_utils.cc
 silentfilesource.cc
@@ -129,6 +129,7 @@ sndfile_helpers.cc
 sndfilesource.cc
 source.cc
 source_factory.cc
+stretch.cc
 tape_file_matcher.cc
 template_utils.cc
 tempo.cc
@@ -231,33 +232,11 @@ def CheckJackRecomputeLatency(context):
         context.Result(result)
         return result
 
-#
-# See if JACK supports jack_port_ensure_monitor_input()
-#
-jack_ensure_monitor_input_test = """
-#include <jack/jack.h>
-int main(int argc, char** argv)
-{
-	    jack_port_t **port;
-
-	    jack_port_ensure_monitor (*port, 1);
-	    return 0;
-
-}
-"""
-
-def CheckJackEnsureMonitorInput(context):
-        context.Message('Checking for jack_port_ensure_monitor_input()...')
-        result = context.TryLink(jack_ensure_monitor_input_test, '.c')
-        context.Result(result)
-        return result
-
 conf = Configure(ardour, custom_tests = {
 	'CheckJackClientOpen' : CheckJackClientOpen,
 	'CheckJackRecomputeLatencies' : CheckJackRecomputeLatencies,
 	'CheckJackRecomputeLatency' : CheckJackRecomputeLatency,
-	'CheckJackVideoFrameOffset' : CheckJackVideoFrameOffset,
-	'CheckJackEnsureMonitorInput' : CheckJackEnsureMonitorInput
+	'CheckJackVideoFrameOffset' : CheckJackVideoFrameOffset
 })
 
 if conf.CheckJackClientOpen():
@@ -271,11 +250,6 @@ if conf.CheckJackRecomputeLatency():
 
 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