diff options
| author | Anatol Belski <ab@php.net> | 2016-09-25 20:57:30 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-09-25 20:57:30 +0200 |
| commit | 2b8024bb049cb9f32da5b107196dcc6c7dd7de35 (patch) | |
| tree | 811a63cdef2d2ef14f61762c67578a5325cde8c8 | |
| parent | bd893061d68f6bd69a3ecdf29f2be7422cb9336d (diff) | |
| parent | 4e7b5ca45953cb22213bbd9ed5b95b4b1898bab0 (diff) | |
| download | php-git-2b8024bb049cb9f32da5b107196dcc6c7dd7de35.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Add an include path for freetype which is relevant for cmake builds
| -rw-r--r-- | ext/gd/config.w32 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/gd/config.w32 b/ext/gd/config.w32 index 2779a5b32d..71cbe9c4ae 100644 --- a/ext/gd/config.w32 +++ b/ext/gd/config.w32 @@ -8,7 +8,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_HEADER_ADD_INCLUDE("ft2build.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\freetype2;" + 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\\libpng16") || |