freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2] master e11cc40 44/68: * meson.build: Fix resource compilatio


From: Werner Lemberg
Subject: [freetype2] master e11cc40 44/68: * meson.build: Fix resource compilation on Windows.
Date: Fri, 5 Mar 2021 09:29:41 -0500 (EST)

branch: master
commit e11cc40a2eab0af601f75259da45e1ffb44b11c4
Author: Xavier Claessens <xavier.claessens@collabora.com>
Commit: Werner Lemberg <wl@gnu.org>

    * 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.
---
 ChangeLog   | 10 ++++++++++
 meson.build |  9 ++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

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 = []
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]