Commit f4a3531655cc6f9b8c1c8b5f4dc097111d672304
2018-03-05T20:45:12
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.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96
diff --git a/ChangeLog b/ChangeLog
index 536ce7c..17a658a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 47d080f..618b634 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 6ce0f3e..25bf9ff 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 2b47b8a..ec17033 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 a1bdbaf..3e5bf22 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 6491f5d..0f47a72 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 \