Werner Lemberg pushed to branch master at FreeType / FreeType
Commits:
-
b37b8d2a
by Loïc Yhuel at 2022-11-14T14:43:04+01:00
[meson] Fix generated ftmodule.h
The sdf module wasn't recognized, so the generated ftmodule.h had "None_renderer_class".
* builds/meson/parse_modules_cfg.py: Handle sdf in RASTER_MODULES.
-
63ccaef0
by Loïc Yhuel at 2022-11-14T14:43:04+01:00
[meson] Use generated ftmodule.h
ftmodule.h is generated at the root of the build directory, but FT_CONFIG_MODULES_H
(freetype/config/ftmodule.h) is used instead.
This makes the build fail when disabling modules in modules.cfg.
* meson.build (harfbuzz_dep): Add '-DFT_CONFIG_MODULES_H=<ftmodule.h>'.
2 changed files:
Changes:
builds/meson/parse_modules_cfg.py
| ... |
... |
@@ -84,14 +84,16 @@ def generate_ftmodule(lists): |
|
84
|
84
|
)
|
|
85
|
85
|
|
|
86
|
86
|
for module in lists["RASTER_MODULES"]:
|
|
87
|
|
- name = {
|
|
88
|
|
- "raster": "ft_raster1",
|
|
89
|
|
- "smooth": "ft_smooth",
|
|
90
|
|
- "svg": "ft_svg",
|
|
|
87
|
+ names = {
|
|
|
88
|
+ "raster": ("ft_raster1",),
|
|
|
89
|
+ "smooth": ("ft_smooth",),
|
|
|
90
|
+ "svg": ("ft_svg",),
|
|
|
91
|
+ "sdf": ("ft_sdf", "ft_bitmap_sdf"),
|
|
91
|
92
|
}.get(module)
|
|
92
|
|
- result += (
|
|
93
|
|
- "FT_USE_MODULE( FT_Renderer_Class, %s_renderer_class )\n" % name
|
|
94
|
|
- )
|
|
|
93
|
+ for name in names:
|
|
|
94
|
+ result += (
|
|
|
95
|
+ "FT_USE_MODULE( FT_Renderer_Class, %s_renderer_class )\n" % name
|
|
|
96
|
+ )
|
|
95
|
97
|
|
|
96
|
98
|
for module in lists["AUX_MODULES"]:
|
|
97
|
99
|
if module in ("psaux", "psnames", "otvalid", "gxvalid"):
|
meson.build
| ... |
... |
@@ -52,6 +52,8 @@ ft2_includes = include_directories('include') |
|
52
|
52
|
|
|
53
|
53
|
freetype_includedir = join_paths(get_option('includedir'), 'freetype2')
|
|
54
|
54
|
|
|
|
55
|
+ft2_defines = []
|
|
|
56
|
+
|
|
55
|
57
|
# Generate a custom `ftmodule.h` version based on the content of
|
|
56
|
58
|
# `modules.cfg`.
|
|
57
|
59
|
|
| ... |
... |
@@ -64,6 +66,7 @@ ftmodule_h = custom_target('ftmodule.h', |
|
64
|
66
|
install_dir: join_paths(freetype_includedir, 'freetype/config'),
|
|
65
|
67
|
)
|
|
66
|
68
|
ft2_sources = [ftmodule_h]
|
|
|
69
|
+ft2_defines += ['-DFT_CONFIG_MODULES_H=<ftmodule.h>']
|
|
67
|
70
|
|
|
68
|
71
|
|
|
69
|
72
|
# FreeType 2 modules.
|
| ... |
... |
@@ -187,7 +190,7 @@ ft2_config_headers = files([ |
|
187
|
190
|
'include/freetype/config/public-macros.h',
|
|
188
|
191
|
])
|
|
189
|
192
|
|
|
190
|
|
-ft2_defines = ['-DFT2_BUILD_LIBRARY=1']
|
|
|
193
|
+ft2_defines += ['-DFT2_BUILD_LIBRARY=1']
|
|
191
|
194
|
|
|
192
|
195
|
|
|
193
|
196
|
# System support file.
|
|