ardour/livetrax
13
0
Fork 0
Code

NOOP, proper label for flat carbon header includes

Browse Source
This commit is contained in:
Robin Gareus 2014-10-07 16:53:10 +02:00
parent aab64ecd5c
commit a7da906a79
3 changed files with 3 additions and 3 deletions
Show Stats 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
*/ */
#ifdef OSX_MAVERICKS #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"

2
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__) && !defined (OSX_MAVERICKS) #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

2
wscript
View File

@ -208,7 +208,7 @@ def set_compiler_flags (conf,opt):
cxx_flags.append('-std=c++11') cxx_flags.append('-std=c++11')
if platform == "darwin": if platform == "darwin":
cxx_flags.append('--stdlib=libstdc++') cxx_flags.append('--stdlib=libstdc++')
cxx_flags.append('-DOSX_MAVERICKS') cxx_flags.append('-DCARBON_FLAT_HEADERS')
linker_flags.append('--stdlib=libstdc++') linker_flags.append('--stdlib=libstdc++')
# Prevents visibility issues in standard headers # Prevents visibility issues in standard headers
conf.define("_DARWIN_C_SOURCE", 1) conf.define("_DARWIN_C_SOURCE", 1)