diff options
| author | Werner Lemberg <wl@gnu.org> | 2018-03-05 23:37:17 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2018-03-05 23:37:17 +0100 |
| commit | 733a21bdbc9516ccf47b9b20d3a39d069a4cdc82 (patch) | |
| tree | bcc3f4acdba441b34a8ef576de5c823c8096223b | |
| parent | f4a3531655cc6f9b8c1c8b5f4dc097111d672304 (diff) | |
| download | freetype2-733a21bdbc9516ccf47b9b20d3a39d069a4cdc82.tar.gz | |
Make `ftlcdfil.c' part of the `base' module.
`ftobjs.c' needs `ft_lcd_padding'.
Problem reported by duhuanpeng <548708880@qq.com>.
* modules.cfg (BASE_EXTENSIONS): Don't include `ftlcdfil.c'.
* src/base/ftbase.c: Include `ftlcdfil.c'.
* src/base/rules.mk (BASE_SRC): Add `ftlcdfil.c'.
* src/base/Jamfile (_sources): Adjusted.
* docs/INSTALL.ANY: Updated.
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | docs/INSTALL.ANY | 1 | ||||
| -rw-r--r-- | modules.cfg | 5 | ||||
| -rw-r--r-- | src/base/Jamfile | 2 | ||||
| -rw-r--r-- | src/base/ftbase.c | 1 | ||||
| -rw-r--r-- | src/base/rules.mk | 1 |
6 files changed, 19 insertions, 7 deletions
@@ -1,5 +1,21 @@ 2018-03-05 Werner Lemberg <wl@gnu.org> + Make `ftlcdfil.c' part of the `base' module. + + `ftobjs.c' needs `ft_lcd_padding'. + + Problem reported by duhuanpeng <548708880@qq.com>. + + * modules.cfg (BASE_EXTENSIONS): Don't include `ftlcdfil.c'. + + * src/base/ftbase.c: Include `ftlcdfil.c'. + * src/base/rules.mk (BASE_SRC): Add `ftlcdfil.c'. + * src/base/Jamfile (_sources): Adjusted. + + * docs/INSTALL.ANY: Updated. + +2018-03-05 Werner Lemberg <wl@gnu.org> + Make `ftfntfmt.c' part of the `base' module. `ftobjs.c' needs `FT_Get_Font_Format'. diff --git a/docs/INSTALL.ANY b/docs/INSTALL.ANY index 618b6341f..fddac9ad2 100644 --- a/docs/INSTALL.ANY +++ b/docs/INSTALL.ANY @@ -42,7 +42,6 @@ I. Standard procedure src/base/ftfstype.c -- optional src/base/ftgasp.c -- optional, see <ftgasp.h> src/base/ftgxval.c -- optional, see <ftgxval.h> - src/base/ftlcdfil.c -- optional, see <ftlcdfil.h> src/base/ftmm.c -- optional, see <ftmm.h> src/base/ftotval.c -- optional, see <ftotval.h> src/base/ftpatent.c -- optional diff --git a/modules.cfg b/modules.cfg index 25bf9ffa5..702cf9913 100644 --- a/modules.cfg +++ b/modules.cfg @@ -203,11 +203,6 @@ BASE_EXTENSIONS += ftglyph.c # See include/freetype/ftgxval.h for the API. BASE_EXTENSIONS += ftgxval.c -# Support for LCD color filtering of subpixel bitmaps. -# -# See include/freetype/ftlcdfil.h for the API. -BASE_EXTENSIONS += ftlcdfil.c - # Multiple Master font interface. # # See include/freetype/ftmm.h for the API. diff --git a/src/base/Jamfile b/src/base/Jamfile index ec1703339..4994c1b4c 100644 --- a/src/base/Jamfile +++ b/src/base/Jamfile @@ -24,6 +24,7 @@ SubDir FT2_TOP $(FT2_SRC_DIR) base ; ftfntfmt ftgloadr fthash + ftlcdfil ftobjs ftoutln ftpic @@ -57,7 +58,6 @@ SubDir FT2_TOP $(FT2_SRC_DIR) base ; ftglyph ftgxval ftinit - ftlcdfil ftmm ftotval ftpatent diff --git a/src/base/ftbase.c b/src/base/ftbase.c index 3e5bf221e..f914b9b24 100644 --- a/src/base/ftbase.c +++ b/src/base/ftbase.c @@ -26,6 +26,7 @@ #include "ftfntfmt.c" #include "ftgloadr.c" #include "fthash.c" +#include "ftlcdfil.c" #include "ftmac.c" #include "ftobjs.c" #include "ftoutln.c" diff --git a/src/base/rules.mk b/src/base/rules.mk index 0f47a7285..e9805bd06 100644 --- a/src/base/rules.mk +++ b/src/base/rules.mk @@ -43,6 +43,7 @@ BASE_SRC := $(BASE_DIR)/basepic.c \ $(BASE_DIR)/ftfntfmt.c \ $(BASE_DIR)/ftgloadr.c \ $(BASE_DIR)/fthash.c \ + $(BASE_DIR)/ftlcdfil.c \ $(BASE_DIR)/ftobjs.c \ $(BASE_DIR)/ftoutln.c \ $(BASE_DIR)/ftpic.c \ |