OSX 10.9.5 compile fixes - part one

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

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

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)