Merging undo branch into trunk. It compiles and works for limited tests. Keep

[ardour.git] / libs / ardour / SConscript

diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index 605911d7ef4c71342689c14e1414195a253fbcd4..44cec8638c1bfd3873e358b8c5a525533ebd5337 100644 (file)
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -27,9 +27,11 @@ ardour.Append(POTFILE = domain + '.pot')
 ardour.Append(CPPPATH = '#libs/surfaces/control_protocol')
 
 ardour_files=Split("""
+diskstream.cc
 audio_diskstream.cc
 audio_library.cc
 audio_playlist.cc
+track.cc
 audio_track.cc
 audioengine.cc
 audiofilesource.cc
@@ -75,6 +77,7 @@ send.cc
 session.cc
 session_butler.cc
 session_click.cc
+session_command.cc
 session_events.cc
 session_export.cc
 session_midi.cc
@@ -87,7 +90,6 @@ sndfile_helpers.cc
 sndfilesource.cc
 source.cc
 state_manager.cc
-stateful.cc
 tempo.cc
 utils.cc
 version.cc
@@ -98,7 +100,7 @@ arch_specific_objects = [ ]
 
 osc_files = [ 'osc.cc' ]
 vst_files = [ 'vst_plugin.cc', 'session_vst.cc' ]
-coreaudio_files = [ 'coreaudio_source.cc' ]
+coreaudio_files = [ 'audio_unit.cc', 'coreaudiosource.cc' ]
 extra_sources = [ ]
 
 if ardour['VST']:
@@ -198,7 +200,7 @@ ardour.Merge ([
             libraries['lrdf'],
             libraries['samplerate'],
             libraries['sigc2'],
-            libraries['pbd3'],
+            libraries['pbd'],
             libraries['soundtouch'],
             libraries['midi++2'],
             libraries['glib2'],
@@ -208,6 +210,9 @@ ardour.Merge ([
 if ardour['LIBLO']:
     ardour.Merge ([ libraries['lo'] ])
 
+if ardour['COREAUDIO']:
+    ardour.Merge ([ libraries['appleutility'] ])
+
 ardour.VersionBuild(['version.cc', 'ardour/version.h'], 'SConscript')
 
 def SharedAsmObjectEmitter(target, source, env):