diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-12-18 15:59:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-18 15:59:06 +0100 |
| commit | e3241d54614ca1a8d18d4273f9e4a3b56ce74c39 (patch) | |
| tree | 0bb0923899ec116780801607fc43308ae21871cb | |
| parent | 402e4b817e26d3d65f97521f4c2b5ab01df1b00c (diff) | |
| parent | c3c7ac0953af8682792062af4c4e8df8abd6d8f8 (diff) | |
Merge pull request #24450 from staalduinen/fix-zlib-freetype-conflict
Disable gzip and lzw support for freetype
| -rw-r--r-- | thirdparty/freetype/include/freetype/config/ftoption.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/thirdparty/freetype/include/freetype/config/ftoption.h b/thirdparty/freetype/include/freetype/config/ftoption.h index 4bcab2af5c..1fc7295a2c 100644 --- a/thirdparty/freetype/include/freetype/config/ftoption.h +++ b/thirdparty/freetype/include/freetype/config/ftoption.h @@ -178,7 +178,7 @@ FT_BEGIN_HEADER /* */ /* Define this macro if you want to enable this `feature'. */ /* */ -#define FT_CONFIG_OPTION_USE_LZW +/* #define FT_CONFIG_OPTION_USE_LZW */ // -GODOT- /*************************************************************************/ @@ -193,7 +193,7 @@ FT_BEGIN_HEADER /* Define this macro if you want to enable this `feature'. See also */ /* the macro FT_CONFIG_OPTION_SYSTEM_ZLIB below. */ /* */ -#define FT_CONFIG_OPTION_USE_ZLIB +/* #define FT_CONFIG_OPTION_USE_ZLIB */ // -GODOT- /*************************************************************************/ |