diff options
| author | marha <marha@users.sourceforge.net> | 2015-06-15 21:36:28 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-06-15 21:36:28 +0200 |
| commit | 008a8d8051786badb83e455bd9281103ba9a6470 (patch) | |
| tree | f99ea672d105271cb60a726fac8022ce47ea2866 /freetype/modules.cfg | |
| parent | 912e881bec8b16f2331225960645c3bdf5a8ba2d (diff) | |
| parent | e8d5e7c4bb11f7fcb0a4ba5c13f43e7929849a2f (diff) | |
| download | vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.tar.gz vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.tar.bz2 vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
freetype/src/base/ftfntfmt.c
freetype/src/cache/ftcimage.c
freetype/src/cid/cidriver.c
freetype/src/truetype/ttdriver.c
mesalib/src/mesa/drivers/dri/common/dri_util.c
mesalib/src/mesa/drivers/dri/swrast/swrast.c
openssl/Makefile
Diffstat (limited to 'freetype/modules.cfg')
| -rw-r--r-- | freetype/modules.cfg | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/freetype/modules.cfg b/freetype/modules.cfg index 4e5259445..9ba66dfc8 100644 --- a/freetype/modules.cfg +++ b/freetype/modules.cfg @@ -1,6 +1,6 @@ # modules.cfg # -# Copyright 2005-2007, 2009-2011, 2013 by +# Copyright 2005-2015 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -168,6 +168,11 @@ BASE_EXTENSIONS += ftbitmap.c # See include/ftcid.h for the API. BASE_EXTENSIONS += ftcid.c +# Support functions for font formats. +# +# See include/ftfntfmt.h for the API. +BASE_EXTENSIONS += ftfntfmt.c + # Access FSType information. Needs fttype1.c. # # See include/freetype.h for the API. @@ -235,11 +240,6 @@ BASE_EXTENSIONS += fttype1.c # See include/ftwinfnt.h for the API. BASE_EXTENSIONS += ftwinfnt.c -# Support functions for X11. -# -# See include/ftxf86.h for the API. -BASE_EXTENSIONS += ftxf86.c - #### #### The components `ftsystem.c' (for memory allocation and stream I/O #### management) and `ftdebug.c' (for emitting debug messages to the user) |