Made CoreAudio library optional.

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

diff --git a/SConstruct b/SConstruct
index 64f023486933f7895649701a784ba34ff5c18245..1c246f9f6687680a9bf0ddcc5b6fede1e7d4d545 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -37,7 +37,8 @@ opts.AddOptions(
     BoolOption('FFT_ANALYSIS', 'Include FFT analysis window', 0),
     BoolOption('SURFACES', 'Build support for control surfaces', 0),
     BoolOption('DMALLOC', 'Compile and link using the dmalloc library', 0),
-    BoolOption('LIBLO', 'Compile with support for liblo library', 1)
+    BoolOption('LIBLO', 'Compile with support for liblo library', 1),
+    BoolOption('COREAUDIO', 'Compile with Apple\'s CoreAudio library -- UNSTABLE', 0)
 )
 
 #----------------------------------------------------------------------

diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index 73137def57cb533167dcce2c01db69b361dc6835..2efaa9b6a26edb562b405cdc78a88e2e76e58da5 100644 (file)
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -175,7 +175,7 @@ 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'):
+if conf.CheckCHeader('/System/Library/Frameworks/AudioToolbox.framework/Headers/ExtendedAudioFile.h') and ardour['COREAUDIO'] == 1:
     ardour.Append(CXXFLAGS="-DHAVE_COREAUDIO")    
     ardour.Append(LINKFLAGS="-framework AudioToolbox")
     #