Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Linux: Relax interdependency between freetype, libpng, and zlib for unvendored builds

Browse source 
This restriction was added to fix #7373 back then, which was a symbol conflict
between FreeType's bundled copy of gzip/zlib, and distro packages.

But we also unbundled FreeType's zlib in #69395 so this is no longer an issue.

On the other hand recent issues pointed out that using system-provided icu4c
or harfbuzz can cause issues (#91401, #100301). We still allow it for now but
raise a warning.
This commit is contained in:
Rémi Verschelde 2024-12-05 16:04:37 +01:00
parent 6f3cc27423
commit 7fe0609118
3 changed files with 7 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/freetype/SCsub
View file

@ -67,8 +67,6 @@ if env["builtin_freetype"]:
env.Prepend(CPPPATH=[thirdparty_dir + "/include"])
env_freetype.Append(CPPDEFINES=["FT2_BUILD_LIBRARY", "FT_CONFIG_OPTION_USE_PNG", "FT_CONFIG_OPTION_SYSTEM_ZLIB"])
if env.dev_build:
env_freetype.Append(CPPDEFINES=["ZLIB_DEBUG"])
# Also requires libpng headers
if env["builtin_libpng"]: