From 084a6e43cd78546168133c066c236fc82c110a43 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 23 Jul 2015 16:09:35 +0200 Subject: [PATCH] enable ext/gd to support libpng16 --- ext/gd/config.w32 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ext/gd/config.w32 b/ext/gd/config.w32 index d9716bae36..f0e0b2296a 100644 --- a/ext/gd/config.w32 +++ b/ext/gd/config.w32 @@ -11,7 +11,8 @@ if (PHP_GD != "no") { 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") || + (CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\libpng16") || + CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\libpng15") || CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\libpng12")) && (CHECK_LIB("libiconv_a.lib;libiconv.lib", "gd", PHP_GD) || CHECK_LIB("iconv_a.lib;iconv.lib", "gd", PHP_GD)) && CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_GD", PHP_GD) && -- 2.50.1