From 41bd254198b8b879a562a85f7dc868c3c0f7fbc1 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 12 Mar 2012 10:33:22 +0100
Subject: Updated to freetype-2.4.9

---
 freetype/builds/mac/FreeType.m68k_cfm.make.txt    | 1 +
 freetype/builds/mac/FreeType.m68k_far.make.txt    | 1 +
 freetype/builds/mac/FreeType.ppc_carbon.make.txt  | 1 +
 freetype/builds/mac/FreeType.ppc_classic.make.txt | 1 +
 freetype/builds/mac/ftmac.c                       | 3 +++
 5 files changed, 7 insertions(+)

(limited to 'freetype/builds/mac')

diff --git a/freetype/builds/mac/FreeType.m68k_cfm.make.txt b/freetype/builds/mac/FreeType.m68k_cfm.make.txt
index 0bd145257..425f9f9ce 100644
--- a/freetype/builds/mac/FreeType.m68k_cfm.make.txt
+++ b/freetype/builds/mac/FreeType.m68k_cfm.make.txt
@@ -17,6 +17,7 @@ Includes        =  \xB6
 Sym-68K         = -sym off
 
 COptions        = \xB6
+			-d FT_MACINTOSH=1 \xB6
 			-d HAVE_FSSPEC=1 \xB6
 			-d HAVE_FSREF=0 \xB6
 			-d HAVE_QUICKDRAW_TOOLBOX=1 \xB6
diff --git a/freetype/builds/mac/FreeType.m68k_far.make.txt b/freetype/builds/mac/FreeType.m68k_far.make.txt
index e8e2f6eb1..ebf5a1b56 100644
--- a/freetype/builds/mac/FreeType.m68k_far.make.txt
+++ b/freetype/builds/mac/FreeType.m68k_far.make.txt
@@ -16,6 +16,7 @@ Includes        =  \xB6
 Sym-68K         = -sym off
 
 COptions        = \xB6
+			-d FT_MACINTOSH=1 \xB6
 			-d HAVE_FSSPEC=1 \xB6
 			-d HAVE_FSREF=0 \xB6
 			-d HAVE_QUICKDRAW_TOOLBOX=1 \xB6
diff --git a/freetype/builds/mac/FreeType.ppc_carbon.make.txt b/freetype/builds/mac/FreeType.ppc_carbon.make.txt
index c37e0f36f..2926413f3 100644
--- a/freetype/builds/mac/FreeType.ppc_carbon.make.txt
+++ b/freetype/builds/mac/FreeType.ppc_carbon.make.txt
@@ -17,6 +17,7 @@ Includes        =  \xB6
 Sym-PPC         = -sym off
 
 PPCCOptions     = \xB6
+			-d FT_MACINTOSH=1 \xB6
 			-d HAVE_FSSPEC=1 \xB6
                         -d HAVE_FSREF=1 \xB6
 			-d HAVE_QUICKDRAW_TOOLBOX=1 \xB6
diff --git a/freetype/builds/mac/FreeType.ppc_classic.make.txt b/freetype/builds/mac/FreeType.ppc_classic.make.txt
index 0c0991eb0..377de9ab9 100644
--- a/freetype/builds/mac/FreeType.ppc_classic.make.txt
+++ b/freetype/builds/mac/FreeType.ppc_classic.make.txt
@@ -17,6 +17,7 @@ Includes        =  \xB6
 Sym-PPC         = -sym off
 
 PPCCOptions     = \xB6
+                        -d FT_MACINTOSH=1 \xB6
                         -d HAVE_FSSPEC=1 \xB6
                         -d HAVE_FSREF=0 \xB6
                         -d HAVE_QUICKDRAW_TOOLBOX=1 \xB6
diff --git a/freetype/builds/mac/ftmac.c b/freetype/builds/mac/ftmac.c
index c974f670f..719dd0ce9 100644
--- a/freetype/builds/mac/ftmac.c
+++ b/freetype/builds/mac/ftmac.c
@@ -171,6 +171,7 @@ typedef short ResourceIndex;
 #define PREFER_LWFN  1
 #endif
 
+#ifdef FT_MACINTOSH
 
 #if !HAVE_QUICKDRAW_CARBON  /* QuickDraw is deprecated since Mac OS X 10.4 */
 
@@ -1527,5 +1528,7 @@ typedef short ResourceIndex;
 
   }
 
+#endif /* FT_MACINTOSH */
+
 
 /* END */
-- 
cgit v1.2.3