OSX 10.9.5 compile fixes - part one

diff --git a/gtk2_ardour/fix_carbon.h b/gtk2_ardour/fix_carbon.h
index 62ff0f3e4ed5fadcd6f41a3a5f4bf325c7c1df0d..3fd3f4e304695a16213aa315e696b42d396cc46f 100644 (file)
--- 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 62f642709a3f6dcd102759d2d74656223d860280..0449ae8358d12ccceb1bbc214038ef859fe1443b 100644 (file)
--- 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

diff --git a/wscript b/wscript
index 68b6b5998c92904fdd72c8acf82c1fa61e95790b..5ca4228cbb5f2ea30800be22dbb6798a56986c28 100644 (file)
--- a/wscript
+++ b/wscript
@@ -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)