From 78859413b35be9e0cb3b9dad8f59aff8fc828742 Mon Sep 17 00:00:00 2001
From: Joshua Granick <joshua@joshuagranick.com>
Date: Wed, 6 May 2015 19:45:16 -0700
Subject: [PATCH] Improve handling of Cairo build configuration

---
 project/Build.xml  | 9 +++++----
 project/lib/cairo  | 2 +-
 project/lib/pixman | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/project/Build.xml b/project/Build.xml
index 2c8a6915b..95704e535 100644
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -42,11 +42,12 @@
 		<section if="LIME_CAIRO">
 			
 			<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/cairo/include" />
+			<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/cairo/include/configs/default/" unless="windows || mac || linux"/>
+			<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/cairo/include/configs/linux/" if="linux"/>
+			<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/cairo/include/configs/windows/" if="windows"/>
+			<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/cairo/include/configs/mac/" if="mac"/>
+			<compilerflag value="-DHAVE_CONFIG_H" />
 			<compilerflag value="-DCAIRO_WIN32_STATIC_BUILD" if="windows" />
-			<compilerflag value="-DCAIRO_HAS_PTHREAD" unless="windows" />
-			<compilerflag value="-DHAVE_STDINT_H" unless="windows" />
-			<compilerflag value="-DHAVE_UINT64_T" unless="windows" />
-			<compilerflag value="-DHAVE_PTHREADS" unless="windows" />
 			
 			<file name="src/graphics/cairo/CairoBindings.cpp" />
 			
diff --git a/project/lib/cairo b/project/lib/cairo
index 47662d0e4..009a03ba0 160000
--- a/project/lib/cairo
+++ b/project/lib/cairo
@@ -1 +1 @@
-Subproject commit 47662d0e4dc7bdefe34953f547f33cfd89c652b0
+Subproject commit 009a03ba08ba98b3e4d20664efd377f0021eed13
diff --git a/project/lib/pixman b/project/lib/pixman
index 95011bab2..12501eb7b 160000
--- a/project/lib/pixman
+++ b/project/lib/pixman
@@ -1 +1 @@
-Subproject commit 95011bab230cdb08839f5696df7031792f371bc2
+Subproject commit 12501eb7bb72fbcf1841914c81bf88331d6dbf5f