change libsndfile to libsndfile-ardour to eliminate possible confusion with a system lib

[ardour.git] / libs / ardour / SConscript

diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index 8df33c1f605c114967f0b1c0876d0f75eb556897..25109d660d81f1aa7803e15c4f223443ce5764df 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
@@ -68,6 +70,7 @@ port.cc
 recent_sessions.cc
 redirect.cc
 region.cc
+region_factory.cc
 reverse.cc
 route.cc
 route_group.cc
@@ -75,6 +78,7 @@ send.cc
 session.cc
 session_butler.cc
 session_click.cc
+session_command.cc
 session_events.cc
 session_export.cc
 session_midi.cc
@@ -86,8 +90,7 @@ session_transport.cc
 sndfile_helpers.cc
 sndfilesource.cc
 source.cc
-state_manager.cc
-stateful.cc
+source_factory.cc
 tempo.cc
 utils.cc
 version.cc
@@ -98,6 +101,7 @@ arch_specific_objects = [ ]
 
 osc_files = [ 'osc.cc' ]
 vst_files = [ 'vst_plugin.cc', 'session_vst.cc' ]
+audiounit_files = [ 'audio_unit.cc' ]
 coreaudio_files = [ 'coreaudiosource.cc' ]
 extra_sources = [ ]
 
@@ -152,9 +156,27 @@ def CheckJackRecomputeLatencies(context):
         context.Result(result)
         return result
 
+jack_video_frame_offset_test = """
+#include <jack/transport.h>
+int main(int argc, char** argv)
+{
+       jack_position_t pos;
+
+       pos.valid & JackVideoFrameOffset;
+       return 0;
+}
+"""
+
+def CheckJackVideoFrameOffset(context):
+       context.Message('Checking for JackVideoFrameOffset in jack_position_bits_t enum...')
+       result = context.TryLink(jack_video_frame_offset_test, '.c')
+       context.Result(result)
+       return result
+
 conf = Configure(ardour, custom_tests = {
        'CheckJackClientOpen' : CheckJackClientOpen,
-       'CheckJackRecomputeLatencies' : CheckJackRecomputeLatencies
+       'CheckJackRecomputeLatencies' : CheckJackRecomputeLatencies,
+       'CheckJackVideoFrameOffset' : CheckJackVideoFrameOffset
 })
 
 if conf.CheckJackClientOpen():
@@ -163,6 +185,14 @@ if conf.CheckJackClientOpen():
 if conf.CheckJackRecomputeLatencies():
     ardour.Append(CXXFLAGS="-DHAVE_JACK_RECOMPUTE_LATENCIES")
 
+if conf.CheckJackVideoFrameOffset():
+       ardour.Append(CXXFLAGS="-DHAVE_JACK_VIDEO_SUPPORT")
+
+if conf.CheckFunc('jack_port_ensure_monitor'):
+    env.Append(CCFLAGS='-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
 #
@@ -176,11 +206,15 @@ if conf.CheckCHeader('sys/vfs.h'):
 if conf.CheckCHeader('/System/Library/Frameworks/CoreMIDI.framework/Headers/CoreMIDI.h'):
     ardour.Append(LINKFLAGS="-framework CoreMIDI")
 
-if conf.CheckCHeader('/System/Library/Frameworks/AudioToolbox.framework/Headers/ExtendedAudioFile.h') and ardour['COREAUDIO'] == 1:
+if conf.CheckCHeader('/System/Library/Frameworks/AudioUnit.framework/Headers/AudioUnit.h') and ardour['AUDIOUNITS']:
+    ardour.Append(CXXFLAGS="-DHAVE_AUDIOUNITS")
+    ardour.Append(LINKFLAGS="-framework AudioUnit")
+    extra_sources += audiounit_files
+ 
+if conf.CheckCHeader('/System/Library/Frameworks/AudioToolbox.framework/Headers/ExtendedAudioFile.h') and ardour['COREAUDIO']:
     ardour.Append(CXXFLAGS="-DHAVE_COREAUDIO")    
     ardour.Append(LINKFLAGS="-framework AudioToolbox")
     extra_sources += coreaudio_files
-    
 
 if env['CONFIG_ARCH'] == 'apple':
     # this next line avoids issues with circular dependencies between libardour and libardour_cp.
@@ -193,7 +227,7 @@ ardour = conf.Finish ()
 ardour.Merge ([
             libraries['core'],
             libraries['xml'],
-            libraries['sndfile'],
+            libraries['sndfile-ardour'],
             libraries['raptor'],
             libraries['lrdf'],
             libraries['samplerate'],
@@ -208,7 +242,8 @@ ardour.Merge ([
 if ardour['LIBLO']:
     ardour.Merge ([ libraries['lo'] ])
 
-ardour.VersionBuild(['version.cc', 'ardour/version.h'], 'SConscript')
+if ardour['COREAUDIO'] or ardour['AUDIOUNITS']:
+    ardour.Merge ([ libraries['appleutility'] ])
 
 def SharedAsmObjectEmitter(target, source, env):
     for tgt in target:
@@ -235,12 +270,15 @@ libardour = ardour.SharedLibrary('ardour', ardour_files + extra_sources + arch_s
 Default(libardour)
 
 if env['NLS']:
-       i18n (ardour, ardour_files + vst_files + coreaudio_files, env)
+       i18n (ardour, ardour_files + vst_files + coreaudio_files + audiounit_files, env)
 
 
 env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libardour))
-             
+
+env.AlwaysBuild ('version.cc')       
+env.Alias('version', ardour.VersionBuild(['version.cc', 'ardour/version.h'], 'SConscript'))
+
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                     [ 'SConscript', 'i18n.h', 'gettext.h', 'sse_functions.s', 'sse_functions_64bit.s' ] +
-                                    ardour_files + vst_files + coreaudio_files +
+                                    ardour_files + osc_files + vst_files + coreaudio_files + audiounit_files +
                                     glob.glob('po/*.po') + glob.glob('ardour/*.h')))