diff options
Diffstat (limited to 'xc/lib/font/fontfile')
| -rw-r--r-- | xc/lib/font/fontfile/Imakefile | 9 | ||||
| -rw-r--r-- | xc/lib/font/fontfile/ffcheck.c | 5 | ||||
| -rw-r--r-- | xc/lib/font/fontfile/register.c | 5 |
3 files changed, 15 insertions, 4 deletions
diff --git a/xc/lib/font/fontfile/Imakefile b/xc/lib/font/fontfile/Imakefile index 10632b982..73fb4027b 100644 --- a/xc/lib/font/fontfile/Imakefile +++ b/xc/lib/font/fontfile/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/14 1996/11/03 19:58:41 kaleb $ -XCOMM $XFree86: xc/lib/font/fontfile/Imakefile,v 3.15 1999/08/21 13:48:01 dawes Exp $ +XCOMM $XFree86: xc/lib/font/fontfile/Imakefile,v 3.16 2000/02/13 06:15:28 dawes Exp $ #include <Server.tmpl> #if DoLoadableServer @@ -27,6 +27,11 @@ CID_DEFINES = -DBUILD_CID #if BuildFreeType FREETYPE_DEFINES = -DBUILD_FREETYPE #endif +#if BuildXTrueType +#if XTTInLibFont +XTRUETYPE_DEFINES = -DBUILD_XTRUETYPE +#endif +#endif #if GzipFontCompression GUNZIP_SRC = gunzip.c @@ -38,7 +43,7 @@ FREETYPE_DEFINES = -DBUILD_FREETYPE DEFINES = StrcasecmpDefines $(ATTRIBDEFS) \ $(SPEEDO_DEFINES) $(TYPE1_DEFINES) $(CID_DEFINES) \ - $(FREETYPE_DEFINES) $(GZIP_DEFS) + $(FREETYPE_DEFINES) $(XTRUETYPE_DEFINES) $(GZIP_DEFS) SRCS = dirfile.c fontdir.c fontfile.c fileio.c fontscale.c \ defaults.c bitsource.c register.c renderers.c bufio.c \ diff --git a/xc/lib/font/fontfile/ffcheck.c b/xc/lib/font/fontfile/ffcheck.c index 9172f45f2..f49e9c144 100644 --- a/xc/lib/font/fontfile/ffcheck.c +++ b/xc/lib/font/fontfile/ffcheck.c @@ -21,7 +21,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/ffcheck.c,v 1.12 1999/08/21 13:48:02 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/ffcheck.c,v 1.13 2000/02/13 06:15:28 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium @@ -136,6 +136,9 @@ FontFileCheckRegisterFpeFunctions (void) #ifdef BUILD_FREETYPE FreeTypeRegisterFontFileFunctions(); #endif +#ifdef BUILD_XTRUETYPE + XTrueTypeRegisterFontFileFunctions(); +#endif #endif /* ifndef LOWMEMFTPT */ diff --git a/xc/lib/font/fontfile/register.c b/xc/lib/font/fontfile/register.c index a894889d7..4e85dae17 100644 --- a/xc/lib/font/fontfile/register.c +++ b/xc/lib/font/fontfile/register.c @@ -21,7 +21,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/register.c,v 1.12 1999/08/21 13:48:04 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/register.c,v 1.13 2000/02/13 06:15:28 dawes Exp $ */ /* * This is in a separate source file so that small programs @@ -59,6 +59,9 @@ FontFileRegisterFpeFunctions(void) #ifdef BUILD_FREETYPE FreeTypeRegisterFontFileFunctions(); #endif +#ifdef BUILD_XTRUETYPE + XTrueTypeRegisterFontFileFunctions(); +#endif #endif /* ifndef LOWMEMFTPT */ |