diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | meson.build | 9 |
2 files changed, 16 insertions, 3 deletions
@@ -1,5 +1,15 @@ 2021-02-09 Xavier Claessens <xavier.claessens@collabora.com> + * meson.build: Fix resource compilation on Windows. + + This is copied from GStreamer's meson port of FreeType. + + (ft2_sources): Add both debug and resource file (the latter for + Windows only). + (ft2_debug_src): Removed. + +2021-02-09 Xavier Claessens <xavier.claessens@collabora.com> + * meson.build: s/ft2_libtool_version/ft2_pkgconfig_version/. (freetype2_dep): Use it. diff --git a/meson.build b/meson.build index 15cc9dfc9..df61dec12 100644 --- a/meson.build +++ b/meson.build @@ -215,11 +215,14 @@ endif # into `ftsystem.c` as well. # if host_machine.system() == 'windows' - ft2_debug_src = 'builds/windows/ftdebug.c' + winmod = import('windows') + ft2_sources += [ + 'builds/windows/ftdebug.c', + winmod.compile_resources('src/base/ftver.rc'), + ] else - ft2_debug_src = 'src/base/ftdebug.c' + ft2_sources += 'src/base/ftdebug.c' endif -ft2_sources += files([ft2_debug_src]) ft2_deps = [] |