--- embedaddon/php/ext/gd/config.w32 2012/02/21 23:47:56 1.1.1.1 +++ embedaddon/php/ext/gd/config.w32 2012/05/29 12:34:39 1.1.1.2 @@ -1,11 +1,13 @@ -// $Id: config.w32,v 1.1.1.1 2012/02/21 23:47:56 misho Exp $ +// $Id: config.w32,v 1.1.1.2 2012/05/29 12:34:39 misho Exp $ // vim:ft=javascript 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 \