diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-10-24 10:37:23 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-10-24 10:37:23 +0200 |
| commit | 071f217388e9eb312da6782770d3605a14a2f62c (patch) | |
| tree | ca4190e092b3f28c37ef58e1e2ffade4f4591a59 | |
| parent | 5054d77b7551e7de8759be6f048919bc4c568905 (diff) | |
| parent | e3ac41830988ad0b5c8424ce85bac47c2a06b00f (diff) | |
| download | php-git-071f217388e9eb312da6782770d3605a14a2f62c.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
enabled libxpm for gd on windows
| -rw-r--r-- | ext/gd/config.w32 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/gd/config.w32 b/ext/gd/config.w32 index 38292d52f4..8c932a037c 100644 --- a/ext/gd/config.w32 +++ b/ext/gd/config.w32 @@ -15,7 +15,9 @@ if (PHP_GD != "no") { (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) && (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "gd", PHP_GD) )) || - (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "gd", PHP_GD)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) + (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "gd", PHP_GD)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) && + CHECK_LIB("libXpm_a.lib", "gd", PHP_GD) && + CHECK_HEADER_ADD_INCLUDE("xpm.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\X11") ) { if (PHP_T1LIB != "no") { if (CHECK_LIB("T1_StaticMD.lib", "gd", PHP_GD) && @@ -56,6 +58,7 @@ if (PHP_GD != "no") { /D HAVE_GD_STRINGTTF=1 \ /D HAVE_GD_WBMP \ /D HAVE_GD_XBM \ +/D HAVE_GD_XPM \ /D HAVE_GD_WEBP \ /D HAVE_LIBFREETYPE=1 \ /D HAVE_LIBGD13=1 \ @@ -65,6 +68,7 @@ if (PHP_GD != "no") { /D HAVE_LIBJPEG \ /D HAVE_LIBVPX \ /D HAVE_LIBPNG \ +/D HAVE_XPM \ /D HAVE_COLORCLOSESTHWB \ /D USE_GD_IMGSTRTTF \ /D USE_GD_IOCTX \ |