summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2015-02-12 20:27:48 +0100
committerAnatol Belski <ab@php.net>2015-02-12 20:27:48 +0100
commitb5aca81de1862d539aded663c68e91f4098b3cde (patch)
treef84f120b4b90bd967128a4c39b3fead35c8ee7b5
parentc2062ca4705330c053463a891ee93c5e319fd464 (diff)
downloadphp-git-b5aca81de1862d539aded663c68e91f4098b3cde.tar.gz
backport gd config.w32 to support freetype 2.5
-rw-r--r--ext/gd/config.w321
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") ||