[meson] Make it work with Windows.
* meson.build: Do not process `ftconfig.h` when not using `ftconfig.h.in`. Fixes #1029.
This commit is contained in:
parent
7227aabb3e
commit
d69d9c2397
|
@ -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>
|
2021-02-25 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
[woff2] Fix memory leak.
|
[woff2] Fix memory leak.
|
||||||
|
|
22
meson.build
22
meson.build
|
@ -288,6 +288,7 @@ if host_machine.system() == 'windows'
|
||||||
ft2_defines += ['-DDLL_EXPORT=1']
|
ft2_defines += ['-DDLL_EXPORT=1']
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
# Generate `ftconfig.h`
|
# Generate `ftconfig.h`
|
||||||
|
|
||||||
ftconfig_command = process_header_command
|
ftconfig_command = process_header_command
|
||||||
|
@ -300,20 +301,17 @@ endif
|
||||||
|
|
||||||
if host_machine.system() in ['linux', 'darwin', 'cygwin']
|
if host_machine.system() in ['linux', 'darwin', 'cygwin']
|
||||||
ftconfig_h_in = files('builds/unix/ftconfig.h.in')
|
ftconfig_h_in = files('builds/unix/ftconfig.h.in')
|
||||||
else
|
ftconfig_h = custom_target('ftconfig.h',
|
||||||
ftconfig_h_in = files('include/freetype/config/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
|
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',
|
ft2_lib = library('freetype',
|
||||||
sources: ft2_sources + [ftmodule_h],
|
sources: ft2_sources + [ftmodule_h],
|
||||||
|
|
Loading…
Reference in New Issue