From 0d7cfe66a69fb03be74e9ff187fa9874d0db13ae Mon Sep 17 00:00:00 2001 From: Taybin Rutkin Date: Tue, 21 Nov 2006 03:34:43 +0000 Subject: [PATCH] Check for COREAUDIO by default. If found, define HAVE_WEAK_COREAUDIO. git-svn-id: svn://localhost/ardour2/trunk@1147 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/SConscript | 9 +++++++-- libs/ardour/ardour/cycles.h | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript index d7beb62772..334cf60e4e 100644 --- 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 ad3e512669..a6f34d59be 100644 --- 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 #else // Due to MacTypes.h and libgnomecanvasmm Rect conflict typedef unsigned long long UInt64; -- 2.30.2