From: Anatol Belski Date: Thu, 12 Feb 2015 19:27:48 +0000 (+0100) Subject: backport gd config.w32 to support freetype 2.5 X-Git-Tag: php-5.5.23RC1~56^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b5aca81de1862d539aded663c68e91f4098b3cde;p=php backport gd config.w32 to support freetype 2.5 --- diff --git a/ext/gd/config.w32 b/ext/gd/config.w32 index 1420b11e6e..2127fc5dce 100644 --- a/ext/gd/config.w32 +++ b/ext/gd/config.w32 @@ -9,6 +9,7 @@ if (PHP_GD != "no") { if ( CHECK_LIB("libjpeg_a.lib;libjpeg.lib", "gd", PHP_GD) && CHECK_LIB("freetype_a.lib;freetype.lib", "gd", PHP_GD) && + CHECK_HEADER_ADD_INCLUDE("ft2build.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include" + ";" + PHP_PHP_BUILD + "\\include\\freetype") && CHECK_LIB("libpng_a.lib;libpng.lib", "gd", PHP_GD) && CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", PHP_GD + ";ext\\gd\\libgd") && (CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\libpng15") ||