smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-21 06:06:25 +01:00
Code Issues Projects Releases Wiki Activity

improved macros for handling Mavericks-style Carbon headers; remove redundant extra addition of --stdlib=libc++ in CXXFLAGS on mavericks

Browse source
This commit is contained in:
Paul Davis 2014-10-07 16:16:57 -04:00
parent a4aa74a5ee
commit d636e1df90
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/appleutility/CAConditionalMacros.h
View file

@ -55,7 +55,7 @@
#include "TargetConditionals.h"
// Determine whether or not to use framework style includes for system headers
#if !defined(CoreAudio_Use_Framework_Includes) && !defined(__COREAUDIO_USE_FLAT_INCLUDES__)
#if !defined(CoreAudio_Use_Framework_Includes) && !defined(__COREAUDIO_USE_FLAT_INCLUDES__) && !defined (CARBON_FLAT_HEADERS)
#if TARGET_RT_MAC_MACHO
#define CoreAudio_Use_Framework_Includes 1
#else
@ -65,7 +65,7 @@
// Include the regular ConditionalMacros.h too, since it has useful stuff that
// TargetConditionals.h lacks for some reason.
#if CoreAudio_Use_Framework_Includes && (MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
#if CoreAudio_Use_Framework_Includes
#include "ConditionalMacros.h"
#else
#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/ConditionalMacros.h>