diff options
| author | Robin Gareus <robin@gareus.org> | 2014-10-07 14:46:06 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-10-07 14:46:06 +0200 |
| commit | 7bfa25777b87836e13d74ba0dec1d7d47edf4c72 (patch) | |
| tree | 888cd5c91b3328d84a7523cc340a8b2fb45605d4 | |
| parent | 94e7015c70a22c8834ce082f954160f79cbaed94 (diff) | |
OSX 10.9.5 compile fixes - part one
| -rw-r--r-- | gtk2_ardour/fix_carbon.h | 4 | ||||
| -rw-r--r-- | libs/appleutility/CAConditionalMacros.h | 2 | ||||
| -rw-r--r-- | wscript | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/gtk2_ardour/fix_carbon.h b/gtk2_ardour/fix_carbon.h index 62ff0f3e4e..3fd3f4e304 100644 --- a/gtk2_ardour/fix_carbon.h +++ b/gtk2_ardour/fix_carbon.h @@ -25,7 +25,11 @@ /* an awful hack to stop Carbon #defines from messing with other code */ +#ifdef OSX_MAVERICKS +#include "MacTypes.h" +#else #include "/System/Library/Frameworks/CoreServices.framework/Headers/../Frameworks/CarbonCore.framework/Headers/MacTypes.h" +#endif #undef Style #undef Fixed #undef Yes diff --git a/libs/appleutility/CAConditionalMacros.h b/libs/appleutility/CAConditionalMacros.h index 62f642709a..0449ae8358 100644 --- a/libs/appleutility/CAConditionalMacros.h +++ b/libs/appleutility/CAConditionalMacros.h @@ -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 (OSX_MAVERICKS) #if TARGET_RT_MAC_MACHO #define CoreAudio_Use_Framework_Includes 1 #else @@ -207,8 +207,9 @@ def set_compiler_flags (conf,opt): conf.check_cxx(cxxflags=["-std=c++11"]) cxx_flags.append('-std=c++11') if platform == "darwin": - cxx_flags.append('-stdlib=libc++') - linker_flags.append('-lc++') + cxx_flags.append('--stdlib=libstdc++') + cxx_flags.append('-DOSX_MAVERICKS') + linker_flags.append('--stdlib=libstdc++') # Prevents visibility issues in standard headers conf.define("_DARWIN_C_SOURCE", 1) |