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

OSX 10.9.5 compile fixes - part one

Browse source
This commit is contained in:
Robin Gareus 2014-10-07 14:46:06 +02:00
parent 94e7015c70
commit 7bfa25777b
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/fix_carbon.h
View file

@ -25,7 +25,11 @@
/* 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
#include "MacTypes.h"
#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"
#endif
#undef Style #undef Style
#undef Fixed #undef Fixed
#undef Yes #undef Yes

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__) #if !defined(CoreAudio_Use_Framework_Includes) && !defined(__COREAUDIO_USE_FLAT_INCLUDES__) && !defined (OSX_MAVERICKS)
#if TARGET_RT_MAC_MACHO #if TARGET_RT_MAC_MACHO
#define CoreAudio_Use_Framework_Includes 1 #define CoreAudio_Use_Framework_Includes 1
#else #else

5
wscript
View file

@ -207,8 +207,9 @@ def set_compiler_flags (conf,opt):
conf.check_cxx(cxxflags=["-std=c++11"]) conf.check_cxx(cxxflags=["-std=c++11"])
cxx_flags.append('-std=c++11') cxx_flags.append('-std=c++11')
if platform == "darwin": if platform == "darwin":
cxx_flags.append('-stdlib=libc++') cxx_flags.append('--stdlib=libstdc++')
linker_flags.append('-lc++') cxx_flags.append('-DOSX_MAVERICKS')
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)