summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorrey Lyons <torrey@mrcla.com>2005-03-17 01:12:07 +0000
committerTorrey Lyons <torrey@mrcla.com>2005-03-17 01:12:07 +0000
commit1ac3dd04b43713d34a31d9d2d181a322290350d3 (patch)
treee6376a5330f022bc2abf421ca60823679fa0aba6
parent1bde5ffb781452af8bfe17061829f5dc369a3136 (diff)
Fix build on stock Mac OS X: Out of the box, Mac OS X does not include
Freetype2, Expat, or PNG. Also global variables should be initalized in the Xserver.
-rw-r--r--darwin.cf11
1 files changed, 10 insertions, 1 deletions
diff --git a/darwin.cf b/darwin.cf
index 96b5484..804cc14 100644
--- a/darwin.cf
+++ b/darwin.cf
@@ -1,4 +1,4 @@
-XCOMM $XdotOrg: xc/config/cf/darwin.cf,v 1.5 2004/10/30 01:41:46 torrey Exp $
+XCOMM $XdotOrg: xc/config/cf/darwin.cf,v 1.6 2004/12/09 22:49:43 torrey Exp $
XCOMM platform: $XFree86: xc/config/cf/darwin.cf,v 1.50 2004/01/20 23:54:50 torrey Exp $
/* Darwin / Mac OS X configuration by John Carmack <johnc@idsoftware.com> */
@@ -51,6 +51,15 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#ifndef HasGcc3
# define HasGcc3 NO
#endif
+#ifndef HasFreetype2
+# define HasFreetype2 NO
+#endif
+#ifndef HasExpat
+# define HasExpat NO
+#endif
+#ifndef HasLibpng
+# define HasLibpng NO
+#endif
/* Older versions don't really support IPv6, but #define AF_INET6. */
#if OSMajorVersion < 6