smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-21 14:16:31 +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

2
gtk2_ardour/fix_carbon.h
View file

@ -25,7 +25,7 @@
/* an awful hack to stop Carbon #defines from messing with other code /* an awful hack to stop Carbon #defines from messing with other code
*/ */
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 #ifdef CARBON_FLAT_HEADERS
#include "MacTypes.h" #include "MacTypes.h"
#else #else
#include "/System/Library/Frameworks/CoreServices.framework/Headers/../Frameworks/CarbonCore.framework/Headers/MacTypes.h" #include "/System/Library/Frameworks/CoreServices.framework/Headers/../Frameworks/CarbonCore.framework/Headers/MacTypes.h"

4
libs/appleutility/CAConditionalMacros.h
View file

@ -55,7 +55,7 @@
#include "TargetConditionals.h" #include "TargetConditionals.h"
// Determine whether or not to use framework style includes for system headers // 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 #if TARGET_RT_MAC_MACHO
#define CoreAudio_Use_Framework_Includes 1 #define CoreAudio_Use_Framework_Includes 1
#else #else
@ -65,7 +65,7 @@
// Include the regular ConditionalMacros.h too, since it has useful stuff that // Include the regular ConditionalMacros.h too, since it has useful stuff that
// TargetConditionals.h lacks for some reason. // 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" #include "ConditionalMacros.h"
#else #else
#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/ConditionalMacros.h> #include <CoreServices/../Frameworks/CarbonCore.framework/Headers/ConditionalMacros.h>

4
wscript
View file

@ -210,7 +210,9 @@ def set_compiler_flags (conf,opt):
conf.env['build_target'] = opt.dist_target conf.env['build_target'] = opt.dist_target
if conf.env['build_target'] == 'mavericks': if conf.env['build_target'] == 'mavericks':
cxx_flags.append('-stdlib=libc++') # Mavericks and later changed the syntax to be used when including Carbon headers,
# from requiring a full path to requiring just the header name.
cxx_flags.append('-DCARBON_FLAT_HEADERS')
if conf.env['build_target'] == 'snowleopard': if conf.env['build_target'] == 'snowleopard':
# #