From b37b8d2a70b967bac95745898f8d9a2d7ff6ac7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Yhuel?= Date: Mon, 14 Nov 2022 11:29:20 +0100 Subject: [PATCH] [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. --- builds/meson/parse_modules_cfg.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/builds/meson/parse_modules_cfg.py b/builds/meson/parse_modules_cfg.py index f68110cf0..deb253411 100644 --- a/builds/meson/parse_modules_cfg.py +++ b/builds/meson/parse_modules_cfg.py @@ -84,14 +84,16 @@ def generate_ftmodule(lists): ) for module in lists["RASTER_MODULES"]: - name = { - "raster": "ft_raster1", - "smooth": "ft_smooth", - "svg": "ft_svg", + names = { + "raster": ("ft_raster1",), + "smooth": ("ft_smooth",), + "svg": ("ft_svg",), + "sdf": ("ft_sdf", "ft_bitmap_sdf"), }.get(module) - result += ( - "FT_USE_MODULE( FT_Renderer_Class, %s_renderer_class )\n" % name - ) + for name in names: + result += ( + "FT_USE_MODULE( FT_Renderer_Class, %s_renderer_class )\n" % name + ) for module in lists["AUX_MODULES"]: if module in ("psaux", "psnames", "otvalid", "gxvalid"):