diff options
| author | Pierre Joye <pajoye@php.net> | 2010-10-04 22:30:35 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2010-10-04 22:30:35 +0000 |
| commit | cccc349aa5d092d9e3bc808e0fcbbd2d8562a8f5 (patch) | |
| tree | 6e30dd3a29961df3c1f76edf37800ed405ba2ff4 /ext/gd/config.w32 | |
| parent | 304bc60e9898da7f1420a372ec929ae331be2570 (diff) | |
| download | php-git-cccc349aa5d092d9e3bc808e0fcbbd2d8562a8f5.tar.gz | |
- initial webp support, rely on libpx, final version will be either w/o dep or using libwebp (to be released by g)
Diffstat (limited to 'ext/gd/config.w32')
| -rw-r--r-- | ext/gd/config.w32 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ext/gd/config.w32 b/ext/gd/config.w32 index 340424b6bf..b05dbe445e 100644 --- a/ext/gd/config.w32 +++ b/ext/gd/config.w32 @@ -5,7 +5,9 @@ ARG_WITH("gd", "Bundled GD support", "yes,shared"); ARG_WITH("t1lib", "t1lib support", "yes"); if (PHP_GD != "no") { - if (CHECK_LIB("libjpeg_a.lib;libjpeg.lib", "gd", PHP_GD) && + if ( + CHECK_LIB("vpxmt.lib", "gd", PHP_GD) && + CHECK_LIB("libjpeg_a.lib;libjpeg.lib", "gd", PHP_GD) && CHECK_LIB("freetype_a.lib;freetype.lib", "gd", PHP_GD) && CHECK_LIB("libpng_a.lib;libpng.lib", "gd", PHP_GD) && CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", PHP_GD + ";ext\\gd\\libgd") && @@ -34,7 +36,7 @@ if (PHP_GD != "no") { gdft.c gd_gd2.c gd_gd.c gd_gif_in.c gd_gif_out.c gdhelpers.c gd_io.c gd_io_dp.c \ gd_io_file.c gd_io_ss.c gd_jpeg.c gdkanji.c gd_png.c gd_ss.c \ gdtables.c gd_topal.c gd_wbmp.c gdxpm.c wbmp.c xbm.c gd_security.c \ - gd_filter.c gd_pixelate.c gd_arc.c gd_rotate.c gd_color.c", "gd"); + gd_filter.c gd_pixelate.c gd_arc.c gd_rotate.c gd_color.c webpimg.c gd_webp.c ", "gd"); AC_DEFINE('HAVE_LIBGD', 1, 'GD support'); ADD_FLAG("CFLAGS_GD", " \ /D HAVE_GD_DYNAMIC_CTX_EX=1 \ @@ -54,12 +56,14 @@ if (PHP_GD != "no") { /D HAVE_GD_STRINGTTF=1 \ /D HAVE_GD_WBMP \ /D HAVE_GD_XBM \ +/D HAVE_GD_WEBP \ /D HAVE_LIBFREETYPE=1 \ /D HAVE_LIBGD13=1 \ /D HAVE_LIBGD15=1 \ /D HAVE_LIBGD20=1 \ /D HAVE_LIBGD204=1 \ /D HAVE_LIBJPEG \ +/D HAVE_LIBVPX \ /D HAVE_LIBPNG \ /D HAVE_COLORCLOSESTHWB \ /D USE_GD_IMGSTRTTF \ |