mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-04-13 01:00:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request from staalduinen/fix-zlib-freetype-conflict

Browse Source 
Disable gzip and lzw support for freetype
This commit is contained in:
Rémi Verschelde 2018-12-18 15:59:06 +01:00 committed by GitHub
commit e3241d5461
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions

4
thirdparty/freetype/include/freetype/config/ftoption.h vendored

@ -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-
/*************************************************************************/