[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master d69d9c2: [meson] Make it work with Windows.
From: |
Werner Lemberg |
Subject: |
[freetype2] master d69d9c2: [meson] Make it work with Windows. |
Date: |
Sun, 7 Mar 2021 11:49:54 -0500 (EST) |
branch: master
commit d69d9c2397afc86e95fef48226364723e14d506c
Author: Xavier Claessens <xavier.claessens@collabora.com>
Commit: Werner Lemberg <wl@gnu.org>
[meson] Make it work with Windows.
* meson.build: Do not process `ftconfig.h` when not using
`ftconfig.h.in`.
Fixes #1029.
---
ChangeLog | 9 +++++++++
meson.build | 22 ++++++++++------------
2 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7945b1e..5b0aab4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2021-03-07 Xavier Claessens <xavier.claessens@collabora.com>
+
+ [meson] Make it work with Windows.
+
+ * meson.build: Do not process `ftconfig.h` when not using
+ `ftconfig.h.in`.
+
+ Fixes #1029.
+
2021-02-25 Werner Lemberg <wl@gnu.org>
[woff2] Fix memory leak.
diff --git a/meson.build b/meson.build
index dc32255..93b4894 100644
--- a/meson.build
+++ b/meson.build
@@ -288,6 +288,7 @@ if host_machine.system() == 'windows'
ft2_defines += ['-DDLL_EXPORT=1']
endif
+
# Generate `ftconfig.h`
ftconfig_command = process_header_command
@@ -300,20 +301,17 @@ endif
if host_machine.system() in ['linux', 'darwin', 'cygwin']
ftconfig_h_in = files('builds/unix/ftconfig.h.in')
-else
- ftconfig_h_in = files('include/freetype/config/ftconfig.h')
+ ftconfig_h = custom_target('ftconfig.h',
+ input: ftconfig_h_in,
+ output: 'ftconfig.h',
+ command: ftconfig_command,
+ install: true,
+ install_dir: 'include/freetype2/freetype/config',
+ )
+ ft2_sources += ftconfig_h
+ ft2_defines += ['-DFT_CONFIG_CONFIG_H=<ftconfig.h>']
endif
-ftconfig_h = custom_target('ftconfig.h',
- input: ftconfig_h_in,
- output: 'ftconfig.h',
- command: ftconfig_command,
- install: true,
- install_dir: 'include/freetype2/freetype/config',
-)
-ft2_sources += ftconfig_h
-ft2_defines += ['-DFT_CONFIG_CONFIG_H=<ftconfig.h>']
-
ft2_lib = library('freetype',
sources: ft2_sources + [ftmodule_h],
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master d69d9c2: [meson] Make it work with Windows.,
Werner Lemberg <=