Commit e11cc40a2eab0af601f75259da45e1ffb44b11c4
2020-10-26T14:21:19
* 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.
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
diff --git a/ChangeLog b/ChangeLog
index ffa8157..e7095d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 15cc9df..df61dec 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 = []