Merge pull request #60 from livecode/cairo-update-fixes

Fix build broken-ness in the Cairo update

Author: peter-b

libcairo/libcairo.gyp

@@ -416,7 +416,7 @@
 							'src/pixman-implementation.c',
 							'src/pixman-linear-gradient.c',
 							'src/pixman-matrix.c',
-							'src/pixman-mips-dspr2.c',
+							#'src/pixman-mips-dspr2.c',
 							'src/pixman-mips.c',
 							'src/pixman-mmx.c',
 							'src/pixman-noop.c',
@@ -431,7 +431,7 @@
 							'src/pixman-timer.c',
 							'src/pixman-trap.c',
 							'src/pixman-utils.c',
-							'src/pixman-vmx.c',
+							#'src/pixman-vmx.c',
 							'src/pixman-x86.c',
 							'src/pixman.c',
 

libcairo/src/cairo-quartz.h

@@ -40,7 +40,15 @@
 
 #if CAIRO_HAS_QUARTZ_SURFACE
 
-#include <ApplicationServices/ApplicationServices.h>
+#include <TargetConditionals.h>
+
+#if TARGET_OS_IPHONE
+#  include <CoreGraphics/CoreGraphics.h>
+#  include <CoreText/CoreText.h>
+#  define ATSUFontID uint32_t
+#else
+#  include <ApplicationServices/ApplicationServices.h>
+#endif
 
 CAIRO_BEGIN_DECLS