coreaudio_source.cc compiles. (finally)

[ardour.git] / libs / ardour / SConscript

diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index e9b38e75c20256415ed6e071304edfc4420e8bce..58e2cb908c4ccc298e915f156da168cde555482e 100644 (file)
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -15,7 +15,7 @@ domain = 'libardour'
 
 ardour.Append(DOMAIN = domain, MAJOR = 1, MINOR = 0, MICRO = 0)
 ardour.Append(CXXFLAGS = "-DPACKAGE=\\\"" + domain + "\\\"")
-ardour.Append(CCFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
+ardour.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
 ardour.Append(PACKAGE = domain)
 ardour.Append(POTFILE = domain + '.pot')
 
@@ -35,6 +35,7 @@ crossfade.cc
 curve.cc
 cycle_timer.cc
 default_click.cc
+destructive_filesource.cc
 diskstream.cc
 filesource.cc
 gain.cc
@@ -49,6 +50,7 @@ location.cc
 mtc_slave.cc
 named_selection.cc
 panner.cc
+pcm_utils.cc
 playlist.cc
 playlist_factory.cc
 plugin.cc
@@ -87,6 +89,7 @@ mix.cc
 arch_specific_objects = [ ]
 
 vst_files = [ 'vst_plugin.cc', 'session_vst.cc' ]
+coreaudio_files = [ 'coreaudio_source.cc' ]
 extra_sources = [ ]
 
 if ardour['VST']:
@@ -141,7 +144,7 @@ conf = Configure(ardour, custom_tests = {
 })
 
 if conf.CheckJackClientOpen():
-    ardour.Append(CXXFLAGS="-DHAVE_JACK_CLIENT_OPEN")
+       ardour.Append(CXXFLAGS="-DHAVE_JACK_CLIENT_OPEN")
 
 if conf.CheckJackRecomputeLatencies():
     ardour.Append(CXXFLAGS="-DHAVE_JACK_RECOMPUTE_LATENCIES")
@@ -156,6 +159,13 @@ if conf.CheckCHeader('wordexp.h'):
 if conf.CheckCHeader('sys/vfs.h'):
     ardour.Append(CXXFLAGS="-DHAVE_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'):
+       ardour.Append(LINKFLAGS="-framework AudioToolbox")
+       extra_sources += coreaudio_files
+
 ardour = conf.Finish ()
 
 ardour.Merge ([
@@ -186,21 +196,32 @@ env['BUILDERS']['SharedAsmObject'] = Builder (action = '$CXX -c -fPIC $SOURCE -o
                                              single_source = 1)
 
 if env['DEVBUILD'] == 1:
-       if env['BUILD_SSE_OPTIMIZATIONS'] == 1:
-               arch_specific_objects = env.SharedAsmObject('sse_functions.os', 'sse_functions.s')
+       if env['FPU_OPTIMIZATION']:
+               if env['DIST_TARGET'] == "i386":
+                       arch_specific_objects = env.SharedAsmObject('sse_functions.os', 'sse_functions.s')
+               if env['DIST_TARGET'] == "i686":
+                       arch_specific_objects = env.SharedAsmObject('sse_functions.os', 'sse_functions.s')
+               if env['DIST_TARGET'] == "x86_64":
+                       arch_specific_objects = env.SharedAsmObject('sse_functions_64bit.os', 'sse_functions_64bit.s')
+                       
        libardour = ardour.SharedLibrary('ardour', ardour_files + extra_sources + arch_specific_objects)
 else:
-       if env['BUILD_SSE_OPTIMIZATIONS'] == 1:
-               arch_specific_objects = env.StaticObject(target='sse_functions',source='sse_functions.s')
+       if env['FPU_OPTIMIZATION']:
+               if env['DIST_TARGET'] == "i386":
+                       arch_specific_objects = env.StaticObject(target='sse_functions',source='sse_functions.s')
+               if env['DIST_TARGET'] == "i686":
+                       arch_specific_objects = env.StaticObject(target='sse_functions',source='sse_functions.s')
+               if env['DIST_TARGET'] == "x86_64":
+                       arch_specific_objects = env.StaticObject(target='sse_functions_64bit',source='sse_functions_64bit.s')
 
        libardour = ardour.StaticLibrary('ardour', ardour_files + extra_sources + arch_specific_objects)
 
 Default(libardour)
 
 if env['NLS']:
-       i18n (ardour, ardour_files + vst_files, env)
+       i18n (ardour, ardour_files + vst_files + coreaudio_files, env)
              
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
-                                    [ 'SConscript', 'i18n.h', 'gettext.h', 'sse_functions.s' ] +
-                                    ardour_files + vst_files + 
+                                    [ 'SConscript', 'i18n.h', 'gettext.h', 'sse_functions.s', 'sse_functions_64bit.s' ] +
+                                    ardour_files + vst_files + coreaudio_files +
                                     glob.glob('po/*.po') + glob.glob('ardour/*.h')))