Browse Source

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

Disable gzip and lzw support for freetype
Rémi Verschelde 6 years ago
parent
commit
e3241d5461
1 changed files with 2 additions and 2 deletions
  1. 2 2
      thirdparty/freetype/include/freetype/config/ftoption.h

+ 2 - 2
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-
 
 
   /*************************************************************************/