diff options
| author | Wez Furlong <wez@php.net> | 2003-12-07 02:58:56 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2003-12-07 02:58:56 +0000 |
| commit | 72f73b7785c03018bb03606898c65ae40cfc0d22 (patch) | |
| tree | 488174fc7d164d5be608605ac6801cf296fa626c /ext | |
| parent | 96a745f2e26a633346c5d098a17a58d11084d0ab (diff) | |
| download | php-git-72f73b7785c03018bb03606898c65ae40cfc0d22.tar.gz | |
tweak build so that it mirrors the source filesystem layout under the build dir. This allows GD extension to build.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/gd/config.w32 | 54 |
1 files changed, 29 insertions, 25 deletions
diff --git a/ext/gd/config.w32 b/ext/gd/config.w32 index 99d5f215d3..c01568f7ca 100644 --- a/ext/gd/config.w32 +++ b/ext/gd/config.w32 @@ -1,7 +1,7 @@ // $Id$ // vim:ft=javascript -ARG_WITH("gd", "Bundled GD support", "no"); +ARG_WITH("gd", "Bundled GD support", "yes"); if (PHP_GD != "no") { if (CHECK_LIB("libjpeg.lib", "gd", PHP_GD) && @@ -10,32 +10,36 @@ if (PHP_GD != "no") { CHECK_LIB("zlib.lib", "gd", PHP_GD) && CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", "ext\\gd\\libgd;" + PHP_GD)) { - EXTENSION("gd", "gd.c gdttf.c"); - ADD_SOURCES("ext/gd/libgd", "gd2copypal.c gd_arc_f_buggy.c gd.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c gdft.c gd_gd2.c gd_gd.c gd_gif_in.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"); + EXTENSION("gd", "gd.c gdttf.c", null, "-Iext/gd/libgd"); + ADD_SOURCES("ext/gd/libgd", "gd2copypal.c gd_arc_f_buggy.c gd.c \ + gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c \ + gdft.c gd_gd2.c gd_gd.c gd_gif_in.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"); AC_DEFINE('HAVE_LIBGD', 1, 'GD support'); ADD_FLAG("CFLAGS_GD", " \ - /D HAVE_GD_BUNDLED=1 \ - /D HAVE_GD_GD2 \ - /D HAVE_GD_GIF_READ=1 \ - /D HAVE_GDIMAGECOLORRESOLVE=1 \ - /D HAVE_GD_IMAGESETBRUSH=1 \ - /D HAVE_GD_IMAGESETTILE=1 \ - /D HAVE_GD_JPG \ - /D HAVE_GD_PNG \ - /D HAVE_GD_STRINGFTEX=1 \ - /D HAVE_GD_STRINGTTF=1 \ - /D HAVE_GD_WBMP \ - /D HAVE_GD_XBM \ - /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_LIBPNG \ - /D USE_GD_IMGSTRTTF \ - /D USE_GD_IOCTX \ - /D MSWIN32 \ +/D HAVE_GD_BUNDLED=1 \ +/D HAVE_GD_GD2 \ +/D HAVE_GD_GIF_READ=1 \ +/D HAVE_GDIMAGECOLORRESOLVE=1 \ +/D HAVE_GD_IMAGESETBRUSH=1 \ +/D HAVE_GD_IMAGESETTILE=1 \ +/D HAVE_GD_JPG \ +/D HAVE_GD_PNG \ +/D HAVE_GD_STRINGFTEX=1 \ +/D HAVE_GD_STRINGTTF=1 \ +/D HAVE_GD_WBMP \ +/D HAVE_GD_XBM \ +/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_LIBPNG \ +/D USE_GD_IMGSTRTTF \ +/D USE_GD_IOCTX \ +/D MSWIN32 \ "); } else { WARNING("gd not enabled; libraries and headers not found"); |