From 44780ca260c10cdcbac85dbf310232b8ec64fbd3 Mon Sep 17 00:00:00 2001
From: Joshua Granick <jgranick@users.noreply.github.com>
Date: Fri, 22 May 2015 15:29:43 -0700
Subject: [PATCH] Fix Cairo build

---
 project/Build.xml | 1 -
 project/lib/cairo | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/project/Build.xml b/project/Build.xml
index 7053dc94d..d56b804e1 100644
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -48,7 +48,6 @@
 			<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_FT_FONT" if="windows" />
 			
 			<file name="src/graphics/cairo/CairoBindings.cpp" />
 			
diff --git a/project/lib/cairo b/project/lib/cairo
index 36250d960..2fd93965a 160000
--- a/project/lib/cairo
+++ b/project/lib/cairo
@@ -1 +1 @@
-Subproject commit 36250d960073542c06820c5791e6ea99ac21995c
+Subproject commit 2fd93965af0d7d55bc060a5b5108e4b1dfbb8a4e