diff options
| author | Xinchen Hui <laruence@php.net> | 2015-02-13 12:54:04 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-02-13 12:54:04 +0800 |
| commit | 371c016986cb9c3ddeefe16375c1a760aafa478d (patch) | |
| tree | fd4bce1135ae63966eb2c154f5a145fbd6f80152 | |
| parent | 68ab716f188b901ebce3c4c249cba45fc36904ba (diff) | |
| parent | b5aca81de1862d539aded663c68e91f4098b3cde (diff) | |
| download | php-git-371c016986cb9c3ddeefe16375c1a760aafa478d.tar.gz | |
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
| -rw-r--r-- | ext/gd/config.w32 | 1 |
1 files changed, 1 insertions, 0 deletions
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") || |