Merge "Fix build on OS X Mavericks" into idea133
diff --git a/android/camera/camera-capture-mac.m b/android/camera/camera-capture-mac.m
index b93d85e..346daa6 100644
--- a/android/camera/camera-capture-mac.m
+++ b/android/camera/camera-capture-mac.m
@@ -21,7 +21,19 @@
*/
#import <Cocoa/Cocoa.h>
-#import <QTKit/QTKit.h>
+#if 0
+#import <QTKit/QTKit>
+#else
+// QTMovieModernizer.h does not compile with current toolchain.
+// TODO: revert this when toolchain is updated.
+#import <QTKit/QTCaptureConnection.h>
+#import <QTKit/QTCaptureDevice.h>
+#import <QTKit/QTCaptureDeviceInput.h>
+#import <QTKit/QTCaptureSession.h>
+#import <QTKit/QTCaptureVideoPreviewOutput.h>
+#import <QTKit/QTMedia.h>
+#import <QTKit/QTSampleBuffer.h>
+#endif
#import <CoreAudio/CoreAudio.h>
#include "android/camera/camera-capture.h"
#include "android/camera/camera-format-converters.h"
diff --git a/distrib/sdl-1.2.15/src/video/quartz/SDL_QuartzVideo.h b/distrib/sdl-1.2.15/src/video/quartz/SDL_QuartzVideo.h
index d00e496..a6b1f6c 100644
--- a/distrib/sdl-1.2.15/src/video/quartz/SDL_QuartzVideo.h
+++ b/distrib/sdl-1.2.15/src/video/quartz/SDL_QuartzVideo.h
@@ -91,7 +91,9 @@
CGDirectDisplayID display; /* 0 == main display (only support single display) */
const void *mode; /* current mode of the display */
const void *save_mode; /* original mode of the display */
+#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1070)
CGDirectPaletteRef palette; /* palette of an 8-bit display */
+#endif
NSOpenGLContext *gl_context; /* OpenGL rendering context */
NSGraphicsContext *nsgfx_context; /* Cocoa graphics context */
Uint32 width, height, bpp; /* frequently used data about the display */
