Werner Lemberg pushed to branch master at FreeType / FreeType
Commits:
-
d69d9c23
by Xavier Claessens at 2021-03-07T17:48:15+01:00
2 changed files:
Changes:
| 1 |
+2021-03-07 Xavier Claessens <xavier.claessens@collabora.com>
|
|
| 2 |
+ |
|
| 3 |
+ [meson] Make it work with Windows.
|
|
| 4 |
+ |
|
| 5 |
+ * meson.build: Do not process `ftconfig.h` when not using
|
|
| 6 |
+ `ftconfig.h.in`.
|
|
| 7 |
+ |
|
| 8 |
+ Fixes #1029.
|
|
| 9 |
+ |
|
| 1 | 10 |
2021-02-25 Werner Lemberg <wl@gnu.org>
|
| 2 | 11 |
|
| 3 | 12 |
[woff2] Fix memory leak.
|
| ... | ... | @@ -288,6 +288,7 @@ if host_machine.system() == 'windows' |
| 288 | 288 |
ft2_defines += ['-DDLL_EXPORT=1']
|
| 289 | 289 |
endif
|
| 290 | 290 |
|
| 291 |
+ |
|
| 291 | 292 |
# Generate `ftconfig.h`
|
| 292 | 293 |
|
| 293 | 294 |
ftconfig_command = process_header_command
|
| ... | ... | @@ -300,20 +301,17 @@ endif |
| 300 | 301 |
|
| 301 | 302 |
if host_machine.system() in ['linux', 'darwin', 'cygwin']
|
| 302 | 303 |
ftconfig_h_in = files('builds/unix/ftconfig.h.in')
|
| 303 |
-else
|
|
| 304 |
- ftconfig_h_in = files('include/freetype/config/ftconfig.h')
|
|
| 304 |
+ ftconfig_h = custom_target('ftconfig.h',
|
|
| 305 |
+ input: ftconfig_h_in,
|
|
| 306 |
+ output: 'ftconfig.h',
|
|
| 307 |
+ command: ftconfig_command,
|
|
| 308 |
+ install: true,
|
|
| 309 |
+ install_dir: 'include/freetype2/freetype/config',
|
|
| 310 |
+ )
|
|
| 311 |
+ ft2_sources += ftconfig_h
|
|
| 312 |
+ ft2_defines += ['-DFT_CONFIG_CONFIG_H=<ftconfig.h>']
|
|
| 305 | 313 |
endif
|
| 306 | 314 |
|
| 307 |
-ftconfig_h = custom_target('ftconfig.h',
|
|
| 308 |
- input: ftconfig_h_in,
|
|
| 309 |
- output: 'ftconfig.h',
|
|
| 310 |
- command: ftconfig_command,
|
|
| 311 |
- install: true,
|
|
| 312 |
- install_dir: 'include/freetype2/freetype/config',
|
|
| 313 |
-)
|
|
| 314 |
-ft2_sources += ftconfig_h
|
|
| 315 |
-ft2_defines += ['-DFT_CONFIG_CONFIG_H=<ftconfig.h>']
|
|
| 316 |
- |
|
| 317 | 315 |
|
| 318 | 316 |
ft2_lib = library('freetype',
|
| 319 | 317 |
sources: ft2_sources + [ftmodule_h],
|