Check for COREAUDIO by default. If found, define HAVE_WEAK_COREAUDIO.

git-svn-id: svn://localhost/ardour2/trunk@1147 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index d7beb6277299148df21c875efdebf32a98ea3160..334cf60e4edbf1b2d4932f2d77f66adce70ceaa1 100644 (file)
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -205,14 +205,19 @@ 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'):
+    ardour.Append(LINKFLAGS="-framework AudioToolbox")
+
+if conf.CheckCHeader('/System/Library/Frameworks/CoreAudio.framework/Headers/CoreAudio.h'):
+    ardour.Append(CXXFLAGS="-DHAVE_WEAK_COREAUDIO")
+
 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']:
+if ardour['COREAUDIO']:
     ardour.Append(CXXFLAGS="-DHAVE_COREAUDIO")    
-    ardour.Append(LINKFLAGS="-framework AudioToolbox")
     extra_sources += coreaudio_files
 
 if env['CONFIG_ARCH'] == 'apple':

diff --git a/libs/ardour/ardour/cycles.h b/libs/ardour/ardour/cycles.h
index ad3e5126690471aee915459af4e2f45fed2282c1..a6f34d59be5d16a77a72f09ccac99d4908de648a 100644 (file)
--- a/libs/ardour/ardour/cycles.h
+++ b/libs/ardour/ardour/cycles.h
@@ -187,7 +187,7 @@ static inline cycles_t get_cycles (void)
 /* begin mach */
 #elif defined(__APPLE__)
 
-#ifdef HAVE_COREAUDIO
+#ifdef HAVE_WEAK_COREAUDIO
 #include <CoreAudio/HostTime.h>
 #else // Due to MacTypes.h and libgnomecanvasmm Rect conflict
 typedef unsigned long long              UInt64;