From d6cf62e911afb45c28873718972744ded3efc533 Mon Sep 17 00:00:00 2001 From: Taybin Rutkin Date: Wed, 7 Jun 2006 17:19:08 +0000 Subject: [PATCH] Made CoreAudio library optional. git-svn-id: svn://localhost/ardour2/trunk@568 d708f5d6-7413-0410-9779-e7cbd77b26cf --- SConstruct | 3 ++- libs/ardour/SConscript | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index 64f0234869..1c246f9f66 100644 --- 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 73137def57..2efaa9b6a2 100644 --- 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") #