general/freetype2
2
0
Fork 0
mirror of git://git.sv.nongnu.org/freetype/freetype2.git synced 2026-01-19 04:52:09 +00:00
Code Issues Projects Releases Wiki Activity

[meson] Add subproject fallbacks for 'libpng' and 'zlib'.

Browse Source 
* subprojects/libpng.wrap, subprojects/zlib.wrap: New files.

* meson.build: Updated.
This commit is contained in:
Tim-Philipp Müller
2021-01-17 15:50:08 +00:00
committed by Werner Lemberg
parent d69d9c2397
commit bb42afbda0
4 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
meson.build
View File

@@ -229,8 +229,7 @@ ftoption_command = process_header_command
# GZip support
zlib_dep = dependency('zlib', required: get_option('zlib'),
fallback: ['zlib', 'zlib_dep'])
zlib_dep = dependency('zlib', required: get_option('zlib'), fallback: 'zlib')
if zlib_dep.found()
ftoption_command += [
'--enable=FT_CONFIG_OPTION_USE_ZLIB',
@@ -251,7 +250,7 @@ if bzip2_dep.found()
endif
# PNG support
libpng_dep = dependency('libpng', required: get_option('png'))
libpng_dep = dependency('libpng', required: get_option('png'), fallback: 'libpng')
if libpng_dep.found()
ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_PNG']
ft2_deps += [libpng_dep]