coreaudio_source.cc compiles. (finally)

[ardour.git] / libs / ardour / SConscript

diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index 6ac880939dae502656a970577a3de6b76b66d544..58e2cb908c4ccc298e915f156da168cde555482e 100644 (file)
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -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
@@ -162,7 +164,7 @@ if conf.CheckCHeader('/System/Library/Frameworks/CoreMIDI.framework/Headers/Core
 
 if conf.CheckCHeader('/System/Library/Frameworks/AudioToolbox.framework/Headers/ExtendedAudioFile.h'):
        ardour.Append(LINKFLAGS="-framework AudioToolbox")
-       #extra_sources += coreaudio_files
+       extra_sources += coreaudio_files
 
 ardour = conf.Finish ()
 
@@ -194,12 +196,23 @@ 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)
 
@@ -209,6 +222,6 @@ if env['NLS']:
        i18n (ardour, ardour_files + vst_files + coreaudio_files, env)
              
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
-                                    [ 'SConscript', 'i18n.h', 'gettext.h', 'sse_functions.s' ] +
+                                    [ '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')))