diff options
| author | Werner Lemberg <wl@gnu.org> | 2018-03-05 20:45:12 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2018-03-05 20:45:12 +0100 |
| commit | f4a3531655cc6f9b8c1c8b5f4dc097111d672304 (patch) | |
| tree | e45c76418cdb32a6648c94af4c8426802189c44e | |
| parent | 5955b77b1dee4363cdd047eb06a701b1cb8fd395 (diff) | |
| download | freetype2-f4a3531655cc6f9b8c1c8b5f4dc097111d672304.tar.gz | |
Make `ftfntfmt.c' part of the `base' module.
`ftobjs.c' needs `FT_Get_Font_Format'.
Problem reported by duhuanpeng <548708880@qq.com>.
* modules.cfg (BASE_EXTENSIONS): Don't include `ftfntfmt.c'.
* src/base/ftbase.c: Include `ftfntfmt.c'.
* src/base/rules.mk (BASE_SRC): Add `ftfntfmt.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,3 +1,19 @@ +2018-03-05 Werner Lemberg <wl@gnu.org> + + Make `ftfntfmt.c' part of the `base' module. + + `ftobjs.c' needs `FT_Get_Font_Format'. + + Problem reported by duhuanpeng <548708880@qq.com>. + + * modules.cfg (BASE_EXTENSIONS): Don't include `ftfntfmt.c'. + + * src/base/ftbase.c: Include `ftfntfmt.c'. + * src/base/rules.mk (BASE_SRC): Add `ftfntfmt.c'. + * src/base/Jamfile (_sources): Adjusted. + + * docs/INSTALL.ANY: Updated. + 2018-03-01 Werner Lemberg <wl@gnu.org> * src/truetype/ttinterp.c (TT_RunIns): Fix tracing arguments. diff --git a/docs/INSTALL.ANY b/docs/INSTALL.ANY index 47d080f28..618b6341f 100644 --- a/docs/INSTALL.ANY +++ b/docs/INSTALL.ANY @@ -39,7 +39,6 @@ I. Standard procedure src/base/ftbdf.c -- optional, see <ftbdf.h> src/base/ftbitmap.c -- optional, see <ftbitmap.h> src/base/ftcid.c -- optional, see <ftcid.h> - src/base/ftfntfmt.c -- optional, see <ftfntfmt.h> src/base/ftfstype.c -- optional src/base/ftgasp.c -- optional, see <ftgasp.h> src/base/ftgxval.c -- optional, see <ftgxval.h> diff --git a/modules.cfg b/modules.cfg index 6ce0f3edb..25bf9ffa5 100644 --- a/modules.cfg +++ b/modules.cfg @@ -183,11 +183,6 @@ BASE_EXTENSIONS += ftbitmap.c # See include/freetype/ftcid.h for the API. BASE_EXTENSIONS += ftcid.c -# Support functions for font formats. -# -# See include/freetype/ftfntfmt.h for the API. -BASE_EXTENSIONS += ftfntfmt.c - # Access FSType information. Needs fttype1.c. # # See include/freetype/freetype.h for the API. diff --git a/src/base/Jamfile b/src/base/Jamfile index 2b47b8a24..ec1703339 100644 --- a/src/base/Jamfile +++ b/src/base/Jamfile @@ -21,6 +21,7 @@ SubDir FT2_TOP $(FT2_SRC_DIR) base ; ftadvanc ftcalc ftdbgmem + ftfntfmt ftgloadr fthash ftobjs @@ -51,7 +52,6 @@ SubDir FT2_TOP $(FT2_SRC_DIR) base ; ftbitmap ftcid ftdebug - ftfntfmt ftfstype ftgasp ftglyph diff --git a/src/base/ftbase.c b/src/base/ftbase.c index a1bdbaf6e..3e5bf221e 100644 --- a/src/base/ftbase.c +++ b/src/base/ftbase.c @@ -23,6 +23,7 @@ #include "ftadvanc.c" #include "ftcalc.c" #include "ftdbgmem.c" +#include "ftfntfmt.c" #include "ftgloadr.c" #include "fthash.c" #include "ftmac.c" diff --git a/src/base/rules.mk b/src/base/rules.mk index 6491f5d8a..0f47a7285 100644 --- a/src/base/rules.mk +++ b/src/base/rules.mk @@ -40,6 +40,7 @@ BASE_SRC := $(BASE_DIR)/basepic.c \ $(BASE_DIR)/ftadvanc.c \ $(BASE_DIR)/ftcalc.c \ $(BASE_DIR)/ftdbgmem.c \ + $(BASE_DIR)/ftfntfmt.c \ $(BASE_DIR)/ftgloadr.c \ $(BASE_DIR)/fthash.c \ $(BASE_DIR)/ftobjs.c \ |