[PHP-CVS] cvs: php-src /ext/gd config.w32
pajoye Tue May 26 19:42:19 2009 UTC
Modified files:
/php-src/ext/gd config.w32
Log:
- add gd_arc to w32 script
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.35r2=1.36diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.35 php-src/ext/gd/config.w32:1.36
--- php-src/ext/gd/config.w32:1.35 Mon Apr 6 11:37:51 2009
+++ php-src/ext/gd/config.w32 Tue May 26 19:42:19 2009
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.35 2009/04/06 11:37:51 pajoye Exp $
+// $Id: config.w32,v 1.36 2009/05/26 19:42:19 pajoye Exp $
// vim:ft=javascript
ARG_WITH(gd, Bundled GD support, yes,shared);
@@ -24,7 +24,7 @@
WARNING(t1lib not enabled; libraries and
headers not found);
}
}
-
+
CHECK_LIB(User32.lib, gd, PHP_GD);
CHECK_LIB(Gdi32.lib, gd, PHP_GD);
@@ -33,7 +33,7 @@
gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c
gdfontt.c \
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_pixelate.c, gd);
+ gdtables.c gd_topal.c gd_wbmp.c gdxpm.c wbmp.c xbm.c
gd_security.c gd_pixelate.c gd_arc.c, gd);
AC_DEFINE('HAVE_LIBGD', 1, 'GD support');
ADD_FLAG(CFLAGS_GD, \
/D HAVE_GD_BUNDLED=1 \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.w32
pajoye Tue May 26 19:43:11 2009 UTC
Modified files:
/php-src/ext/gd config.w32
Log:
- gd_filter.c
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.36r2=1.37diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.36 php-src/ext/gd/config.w32:1.37
--- php-src/ext/gd/config.w32:1.36 Tue May 26 19:42:19 2009
+++ php-src/ext/gd/config.w32 Tue May 26 19:43:11 2009
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.36 2009/05/26 19:42:19 pajoye Exp $
+// $Id: config.w32,v 1.37 2009/05/26 19:43:11 pajoye Exp $
// vim:ft=javascript
ARG_WITH(gd, Bundled GD support, yes,shared);
@@ -33,7 +33,7 @@
gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c
gdfontt.c \
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_pixelate.c gd_arc.c, gd);
+ 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);
AC_DEFINE('HAVE_LIBGD', 1, 'GD support');
ADD_FLAG(CFLAGS_GD, \
/D HAVE_GD_BUNDLED=1 \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.w32
pajoye Mon Apr 6 11:37:52 2009 UTC
Modified files:
/php-src/ext/gd config.w32
Log:
- nuke unused var
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.34r2=1.35diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.34 php-src/ext/gd/config.w32:1.35
--- php-src/ext/gd/config.w32:1.34 Sun Mar 29 14:01:15 2009
+++ php-src/ext/gd/config.w32 Mon Apr 6 11:37:51 2009
@@ -1,19 +1,18 @@
-// $Id: config.w32,v 1.34 2009/03/29 14:01:15 pajoye Exp $
+// $Id: config.w32,v 1.35 2009/04/06 11:37:51 pajoye 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.lib, gd, PHP_GD)
- (CHECK_LIB(freetype_a.lib, gd, PHP_GD) ||
CHECK_LIB(freetype2.lib, gd, PHP_GD) )
- (CHECK_LIB(libpng_a.lib, gd, PHP_GD) ||
CHECK_LIB(libpng.lib, gd, PHP_GD) )
+ if (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(png.h, CFLAGS_GD, PHP_GD + ; +
PHP_PHP_BUILD + \\include\\libpng12)
CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, PHP_GD +
;ext\\gd\\libgd)
- (CHECK_LIB(libiconv_a.lib, gd, PHP_GD) ||
CHECK_LIB(libiconv.lib, gd, PHP_GD) ||
-CHECK_LIB(iconv_a.lib, gd, PHP_GD) ||
CHECK_LIB(iconv.lib, gd, PHP_GD))
+ (CHECK_LIB(libiconv_a.lib;libiconv.llib, 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, gd, PHP_GD) ||
CHECK_LIB(zlib.lib, 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)))
) {
if (PHP_T1LIB != no) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.w32
pajoye Sun Mar 29 14:01:15 2009 UTC Modified files: /php-src/ext/gd config.w32 Log: - check in the libpng dir as well http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.33r2=1.34diff_format=u Index: php-src/ext/gd/config.w32 diff -u php-src/ext/gd/config.w32:1.33 php-src/ext/gd/config.w32:1.34 --- php-src/ext/gd/config.w32:1.33 Wed Jan 14 18:57:51 2009 +++ php-src/ext/gd/config.w32 Sun Mar 29 14:01:15 2009 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.33 2009/01/14 18:57:51 tabe Exp $ +// $Id: config.w32,v 1.34 2009/03/29 14:01:15 pajoye Exp $ // vim:ft=javascript ARG_WITH(gd, Bundled GD support, yes,shared); @@ -8,6 +8,7 @@ if (CHECK_LIB(libjpeg.lib, gd, PHP_GD) (CHECK_LIB(freetype_a.lib, gd, PHP_GD) || CHECK_LIB(freetype2.lib, gd, PHP_GD) ) (CHECK_LIB(libpng_a.lib, gd, PHP_GD) || CHECK_LIB(libpng.lib, gd, PHP_GD) ) + CHECK_HEADER_ADD_INCLUDE(png.h, CFLAGS_GD, PHP_GD + ; + PHP_PHP_BUILD + \\include\\libpng12) CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, PHP_GD + ;ext\\gd\\libgd) (CHECK_LIB(libiconv_a.lib, gd, PHP_GD) || CHECK_LIB(libiconv.lib, gd, PHP_GD) || CHECK_LIB(iconv_a.lib, gd, PHP_GD) || CHECK_LIB(iconv.lib, gd, PHP_GD)) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.w32
kalle Sun Jul 20 19:00:35 2008 UTC Modified files: /php-src/ext/gd config.w32 Log: Fixed #44849 (imagecolorclosesthwb() is not available on Windows) http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.31r2=1.32diff_format=u Index: php-src/ext/gd/config.w32 diff -u php-src/ext/gd/config.w32:1.31 php-src/ext/gd/config.w32:1.32 --- php-src/ext/gd/config.w32:1.31 Fri Jul 11 15:06:06 2008 +++ php-src/ext/gd/config.w32 Sun Jul 20 19:00:35 2008 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.31 2008/07/11 15:06:06 rrichards Exp $ +// $Id: config.w32,v 1.32 2008/07/20 19:00:35 kalle Exp $ // vim:ft=javascript ARG_WITH(gd, Bundled GD support, yes,shared); @@ -53,6 +53,7 @@ /D HAVE_LIBFREETYPE=1 \ /D HAVE_LIBJPEG \ /D HAVE_LIBPNG \ +/D HAVE_COLORCLOSESTHWB \ /D USE_GD_IMGSTRTTF \ /D MSWIN32 \ ); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.w32
rrichards Fri Jul 11 14:42:00 2008 UTC
Modified files:
/php-src/ext/gd config.w32
Log:
MFB: fix iconv linking
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.29r2=1.30diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.29 php-src/ext/gd/config.w32:1.30
--- php-src/ext/gd/config.w32:1.29 Wed Jul 9 16:13:53 2008
+++ php-src/ext/gd/config.w32 Fri Jul 11 14:42:00 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.29 2008/07/09 16:13:53 rrichards Exp $
+// $Id: config.w32,v 1.30 2008/07/11 14:42:00 rrichards Exp $
// vim:ft=javascript
ARG_WITH(gd, Bundled GD support, yes,shared);
@@ -8,12 +8,10 @@
if (CHECK_LIB(libjpeg.lib, gd, PHP_GD)
(CHECK_LIB(freetype_a.lib, gd, PHP_GD) ||
CHECK_LIB(freetype2.lib, gd, PHP_GD) )
(CHECK_LIB(libpng_a.lib, gd, PHP_GD) ||
CHECK_LIB(libpng.lib, gd, PHP_GD) )
- (CHECK_LIB(libiconv_a.lib, gd, PHP_GD) ||
CHECK_LIB(libiconv.lib, gd, PHP_GD) )
CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, PHP_GD +
;ext\\gd\\libgd)
- (CHECK_LIB(libiconv_a.lib, iconv, PHP_ICONV) ||
CHECK_LIB(libiconv.lib, iconv, PHP_ICONV) ||
-CHECK_LIB(iconv_a.lib, iconv, PHP_ICONV) ||
CHECK_LIB(iconv.lib, iconv, PHP_ICONV))
- CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS_ICONV, PHP_ICONV)
- (((PHP_ZLIB==no) (CHECK_LIB(zlib_a.lib, gd, PHP_GD) ||
CHECK_LIB(zlib.lib, gd, PHP_GD))) ||
+ (CHECK_LIB(libiconv_a.lib, gd, PHP_GD) ||
CHECK_LIB(libiconv.lib, gd, PHP_GD) ||
+CHECK_LIB(iconv_a.lib, gd, PHP_GD) ||
CHECK_LIB(iconv.lib, gd, PHP_GD))
+ (((PHP_ZLIB==no) (CHECK_LIB(zlib_a.lib, gd, PHP_GD) ||
CHECK_LIB(zlib.lib, gd, PHP_GD))) ||
(PHP_ZLIB_SHARED CHECK_LIB(zlib.lib, gd,
PHP_GD)) || (PHP_ZLIB == yes (!PHP_ZLIB_SHARED)))
) {
if (PHP_T1LIB != no) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.w32
rrichards Fri Jul 11 15:06:06 2008 UTC
Modified files:
/php-src/ext/gd config.w32
Log:
MFB: dont forget the header
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.30r2=1.31diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.30 php-src/ext/gd/config.w32:1.31
--- php-src/ext/gd/config.w32:1.30 Fri Jul 11 14:42:00 2008
+++ php-src/ext/gd/config.w32 Fri Jul 11 15:06:06 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.30 2008/07/11 14:42:00 rrichards Exp $
+// $Id: config.w32,v 1.31 2008/07/11 15:06:06 rrichards Exp $
// vim:ft=javascript
ARG_WITH(gd, Bundled GD support, yes,shared);
@@ -11,6 +11,7 @@
CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, PHP_GD +
;ext\\gd\\libgd)
(CHECK_LIB(libiconv_a.lib, gd, PHP_GD) ||
CHECK_LIB(libiconv.lib, gd, PHP_GD) ||
CHECK_LIB(iconv_a.lib, gd, PHP_GD) ||
CHECK_LIB(iconv.lib, gd, PHP_GD))
+CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS_GD, PHP_GD)
(((PHP_ZLIB==no) (CHECK_LIB(zlib_a.lib, gd, PHP_GD) ||
CHECK_LIB(zlib.lib, gd, PHP_GD))) ||
(PHP_ZLIB_SHARED CHECK_LIB(zlib.lib, gd,
PHP_GD)) || (PHP_ZLIB == yes (!PHP_ZLIB_SHARED)))
) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.w32 /ext/zip config.w32
rrichards Wed Jul 9 16:13:53 2008 UTC
Modified files:
/php-src/ext/gd config.w32
/php-src/ext/zipconfig.w32
Log:
MFB: fix zlib detection and linking
- synch zip config.w32
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.28r2=1.29diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.28 php-src/ext/gd/config.w32:1.29
--- php-src/ext/gd/config.w32:1.28 Tue Jul 8 19:07:53 2008
+++ php-src/ext/gd/config.w32 Wed Jul 9 16:13:53 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.28 2008/07/08 19:07:53 pajoye Exp $
+// $Id: config.w32,v 1.29 2008/07/09 16:13:53 rrichards Exp $
// vim:ft=javascript
ARG_WITH(gd, Bundled GD support, yes,shared);
@@ -13,7 +13,8 @@
(CHECK_LIB(libiconv_a.lib, iconv, PHP_ICONV) ||
CHECK_LIB(libiconv.lib, iconv, PHP_ICONV) ||
CHECK_LIB(iconv_a.lib, iconv, PHP_ICONV) ||
CHECK_LIB(iconv.lib, iconv, PHP_ICONV))
CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS_ICONV, PHP_ICONV)
- ((!PHP_ZLIB_SHARED) (CHECK_LIB(zlib_a.lib, gd, PHP_GD)
|| CHECK_LIB(zlib.lib, gd, PHP_GD)))
+ (((PHP_ZLIB==no) (CHECK_LIB(zlib_a.lib, gd, PHP_GD) ||
CHECK_LIB(zlib.lib, gd, PHP_GD))) ||
+ (PHP_ZLIB_SHARED CHECK_LIB(zlib.lib, gd,
PHP_GD)) || (PHP_ZLIB == yes (!PHP_ZLIB_SHARED)))
) {
if (PHP_T1LIB != no) {
if (CHECK_LIB(T1_StaticMD.lib, gd, PHP_GD)
@@ -24,6 +25,7 @@
WARNING(t1lib not enabled; libraries and
headers not found);
}
}
+
CHECK_LIB(User32.lib, gd, PHP_GD);
CHECK_LIB(Gdi32.lib, gd, PHP_GD);
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/config.w32?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/zip/config.w32
diff -u php-src/ext/zip/config.w32:1.4 php-src/ext/zip/config.w32:1.5
--- php-src/ext/zip/config.w32:1.4 Mon Jan 14 03:15:50 2008
+++ php-src/ext/zip/config.w32 Wed Jul 9 16:13:53 2008
@@ -1,14 +1,13 @@
-// $Id: config.w32,v 1.4 2008/01/14 03:15:50 cellog Exp $
+// $Id: config.w32,v 1.5 2008/07/09 16:13:53 rrichards Exp $
// vim:ft=javascript
-ARG_ENABLE(zip, ZIP support, no);
+ARG_ENABLE(zip, ZIP support, yes);
if (PHP_ZIP != no) {
-
- if (CHECK_HEADER_ADD_INCLUDE(zlib.h, CFLAGS_ZIP, ..\\zlib; +
php_usual_include_suspects + ; + PHP_ZIP)) {
- if (PHP_ZLIB_SHARED) {
- CHECK_LIB(zlib.lib, zip, PHP_ZIP);
- }
+ if (CHECK_HEADER_ADD_INCLUDE(zlib.h, CFLAGS_ZIP, ..\\zlib; +
PHP_ZIP)
+ (((PHP_ZLIB==no) (CHECK_LIB(zlib_a.lib, zip, PHP_ZIP)
|| CHECK_LIB(zlib.lib, zip, PHP_ZIP))) ||
+ (PHP_ZLIB_SHARED CHECK_LIB(zlib.lib, zip,
PHP_ZIP)) || (PHP_ZLIB == yes (!PHP_ZLIB_SHARED)))
+ ) {
EXTENSION('zip', 'php_zip.c zip_stream.c');
ADD_SOURCES(configure_module_dirname + /lib, zip_add.c
zip_error.c zip_fclose.c \
zip_fread.c zip_open.c zip_source_filep.c \
@@ -29,9 +28,7 @@
zip_unchange_archive.c zip_memdup.c zip_stat_init.c \
zip_add_dir.c zip_file_error_clear.c zip_error_clear.c,
zip);
- AC_DEFINE('HAVE_ZLIB', 1);
AC_DEFINE('HAVE_ZIP', 1);
- ADD_FLAG(CFLAGS_ZIP, /D PHP_ZIP_EXPORTS );
} else {
WARNING(zip not enabled; libraries and headers not found);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.w32
pajoye Tue Jul 8 19:07:53 2008 UTC
Modified files:
/php-src/ext/gd config.w32
Log:
- use _a for static lib
- fix logic for shared zlib
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.27r2=1.28diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.27 php-src/ext/gd/config.w32:1.28
--- php-src/ext/gd/config.w32:1.27 Mon Jul 7 08:40:04 2008
+++ php-src/ext/gd/config.w32 Tue Jul 8 19:07:53 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.27 2008/07/07 08:40:04 pajoye Exp $
+// $Id: config.w32,v 1.28 2008/07/08 19:07:53 pajoye Exp $
// vim:ft=javascript
ARG_WITH(gd, Bundled GD support, yes,shared);
@@ -6,14 +6,14 @@
if (PHP_GD != no) {
if (CHECK_LIB(libjpeg.lib, gd, PHP_GD)
- (CHECK_LIB(freetype.lib, gd, PHP_GD) ||
CHECK_LIB(freetype2.lib, gd, PHP_GD) )
+ (CHECK_LIB(freetype_a.lib, gd, PHP_GD) ||
CHECK_LIB(freetype2.lib, gd, PHP_GD) )
(CHECK_LIB(libpng_a.lib, gd, PHP_GD) ||
CHECK_LIB(libpng.lib, gd, PHP_GD) )
(CHECK_LIB(libiconv_a.lib, gd, PHP_GD) ||
CHECK_LIB(libiconv.lib, gd, PHP_GD) )
CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, PHP_GD +
;ext\\gd\\libgd)
(CHECK_LIB(libiconv_a.lib, iconv, PHP_ICONV) ||
CHECK_LIB(libiconv.lib, iconv, PHP_ICONV) ||
CHECK_LIB(iconv_a.lib, iconv, PHP_ICONV) ||
CHECK_LIB(iconv.lib, iconv, PHP_ICONV))
CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS_ICONV, PHP_ICONV)
- ((!PHP_ZLIB_SHARED) || CHECK_LIB(zlib_a.lib, gd, PHP_GD) ||
CHECK_LIB(zlib.lib, gd, PHP_GD))
+ ((!PHP_ZLIB_SHARED) (CHECK_LIB(zlib_a.lib, gd, PHP_GD)
|| CHECK_LIB(zlib.lib, gd, PHP_GD)))
) {
if (PHP_T1LIB != no) {
if (CHECK_LIB(T1_StaticMD.lib, gd, PHP_GD)
@@ -24,11 +24,6 @@
WARNING(t1lib not enabled; libraries and
headers not found);
}
}
-
- if (PHP_ZLIB == no || PHP_ZLIB_SHARED) {
- CHECK_LIB(zlib.lib, gd, PHP_GD);
- }
-
CHECK_LIB(User32.lib, gd, PHP_GD);
CHECK_LIB(Gdi32.lib, gd, PHP_GD);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.w32 gd.c
pajoye Mon Jul 7 08:36:04 2008 UTC
Modified files:
/php-src/ext/gd config.w32 gd.c
Log:
- restore wrongly removed vars
- test if zlib is shared or not (possible conflict)
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.25r2=1.26diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.25 php-src/ext/gd/config.w32:1.26
--- php-src/ext/gd/config.w32:1.25 Sun Jul 6 17:06:43 2008
+++ php-src/ext/gd/config.w32 Mon Jul 7 08:36:04 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.25 2008/07/06 17:06:43 pajoye Exp $
+// $Id: config.w32,v 1.26 2008/07/07 08:36:04 pajoye Exp $
// vim:ft=javascript
ARG_WITH(gd, Bundled GD support, yes,shared);
@@ -8,12 +8,12 @@
if (CHECK_LIB(libjpeg.lib, gd, PHP_GD)
(CHECK_LIB(freetype.lib, gd, PHP_GD) ||
CHECK_LIB(freetype2.lib, gd, PHP_GD) )
(CHECK_LIB(libpng_a.lib, gd, PHP_GD) ||
CHECK_LIB(libpng.lib, gd, PHP_GD) )
- (CHECK_LIB(zlib_a.lib, gd, PHP_GD) || CHECK_LIB(zlib.lib,
gd, PHP_GD) )
(CHECK_LIB(libiconv_a.lib, gd, PHP_GD) ||
CHECK_LIB(libiconv.lib, gd, PHP_GD) )
CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, PHP_GD +
;ext\\gd\\libgd)
(CHECK_LIB(libiconv_a.lib, iconv, PHP_ICONV) ||
CHECK_LIB(libiconv.lib, iconv, PHP_ICONV) ||
CHECK_LIB(iconv_a.lib, iconv, PHP_ICONV) ||
CHECK_LIB(iconv.lib, iconv, PHP_ICONV))
- CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS_ICONV, PHP_ICONV)
+ CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS_ICONV, PHP_ICONV)
+ ((!PHP_ZLIB_SHARED) || CHECK_LIB(zlib_a.lib, gd, PHP_GD))
) {
if (PHP_T1LIB != no) {
if (CHECK_LIB(T1_StaticMD.lib, gd, PHP_GD)
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.387r2=1.388diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.387 php-src/ext/gd/gd.c:1.388
--- php-src/ext/gd/gd.c:1.387 Sun Jul 6 17:06:43 2008
+++ php-src/ext/gd/gd.c Mon Jul 7 08:36:04 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.387 2008/07/06 17:06:43 pajoye Exp $ */
+/* $Id: gd.c,v 1.388 2008/07/07 08:36:04 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -1906,6 +1906,8 @@
HDC memDC;
HBITMAP memBM;
HBITMAP hOld;
+ HINSTANCE handle;
+ long lwindow_handle;
typedef BOOL (WINAPI *tPrintWindow)(HWND, HDC,UINT);
tPrintWindow pPrintWindow = 0;
gdImagePtr im;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.w32 gd.c
pajoye Mon Jul 7 08:40:04 2008 UTC
Modified files:
/php-src/ext/gd config.w32 gd.c
Log:
- add support for old named zlib (no _a or dynamic)
- nuke the right unused vars
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.26r2=1.27diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.26 php-src/ext/gd/config.w32:1.27
--- php-src/ext/gd/config.w32:1.26 Mon Jul 7 08:36:04 2008
+++ php-src/ext/gd/config.w32 Mon Jul 7 08:40:04 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.26 2008/07/07 08:36:04 pajoye Exp $
+// $Id: config.w32,v 1.27 2008/07/07 08:40:04 pajoye Exp $
// vim:ft=javascript
ARG_WITH(gd, Bundled GD support, yes,shared);
@@ -13,7 +13,7 @@
(CHECK_LIB(libiconv_a.lib, iconv, PHP_ICONV) ||
CHECK_LIB(libiconv.lib, iconv, PHP_ICONV) ||
CHECK_LIB(iconv_a.lib, iconv, PHP_ICONV) ||
CHECK_LIB(iconv.lib, iconv, PHP_ICONV))
CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS_ICONV, PHP_ICONV)
- ((!PHP_ZLIB_SHARED) || CHECK_LIB(zlib_a.lib, gd, PHP_GD))
+ ((!PHP_ZLIB_SHARED) || CHECK_LIB(zlib_a.lib, gd, PHP_GD) ||
CHECK_LIB(zlib.lib, gd, PHP_GD))
) {
if (PHP_T1LIB != no) {
if (CHECK_LIB(T1_StaticMD.lib, gd, PHP_GD)
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.388r2=1.389diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.388 php-src/ext/gd/gd.c:1.389
--- php-src/ext/gd/gd.c:1.388 Mon Jul 7 08:36:04 2008
+++ php-src/ext/gd/gd.c Mon Jul 7 08:40:04 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.388 2008/07/07 08:36:04 pajoye Exp $ */
+/* $Id: gd.c,v 1.389 2008/07/07 08:40:04 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -1994,8 +1994,6 @@
HDC memDC;
HBITMAP memBM;
HBITMAP hOld;
- HINSTANCE handle;
- long lwindow_handle;
typedef BOOL (WINAPI *tPrintWindow)(HWND, HDC,UINT);
tPrintWindow pPrintWindow = 0;
gdImagePtr im;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.w32 gd.c
pajoye Sun Jul 6 17:06:43 2008 UTC
Modified files:
/php-src/ext/gd config.w32 gd.c
Log:
- update lib/headers detection
- nuke unused variables
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.24r2=1.25diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.24 php-src/ext/gd/config.w32:1.25
--- php-src/ext/gd/config.w32:1.24 Tue Apr 17 15:11:56 2007
+++ php-src/ext/gd/config.w32 Sun Jul 6 17:06:43 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.24 2007/04/17 15:11:56 pajoye Exp $
+// $Id: config.w32,v 1.25 2008/07/06 17:06:43 pajoye Exp $
// vim:ft=javascript
ARG_WITH(gd, Bundled GD support, yes,shared);
@@ -6,9 +6,14 @@
if (PHP_GD != no) {
if (CHECK_LIB(libjpeg.lib, gd, PHP_GD)
- CHECK_LIB(freetype2.lib, gd, PHP_GD)
- CHECK_LIB(libpng.lib, gd, PHP_GD)
- CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, PHP_GD +
;ext\\gd\\libgd)
+ (CHECK_LIB(freetype.lib, gd, PHP_GD) ||
CHECK_LIB(freetype2.lib, gd, PHP_GD) )
+ (CHECK_LIB(libpng_a.lib, gd, PHP_GD) ||
CHECK_LIB(libpng.lib, gd, PHP_GD) )
+ (CHECK_LIB(zlib_a.lib, gd, PHP_GD) || CHECK_LIB(zlib.lib,
gd, PHP_GD) )
+ (CHECK_LIB(libiconv_a.lib, gd, PHP_GD) ||
CHECK_LIB(libiconv.lib, gd, PHP_GD) )
+ CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, PHP_GD +
;ext\\gd\\libgd)
+ (CHECK_LIB(libiconv_a.lib, iconv, PHP_ICONV) ||
CHECK_LIB(libiconv.lib, iconv, PHP_ICONV) ||
+CHECK_LIB(iconv_a.lib, iconv, PHP_ICONV) ||
CHECK_LIB(iconv.lib, iconv, PHP_ICONV))
+ CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS_ICONV, PHP_ICONV)
) {
if (PHP_T1LIB != no) {
if (CHECK_LIB(T1_StaticMD.lib, gd, PHP_GD)
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.386r2=1.387diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.386 php-src/ext/gd/gd.c:1.387
--- php-src/ext/gd/gd.c:1.386 Sun May 4 21:16:22 2008
+++ php-src/ext/gd/gd.c Sun Jul 6 17:06:43 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.386 2008/05/04 21:16:22 colder Exp $ */
+/* $Id: gd.c,v 1.387 2008/07/06 17:06:43 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -1906,8 +1906,6 @@
HDC memDC;
HBITMAP memBM;
HBITMAP hOld;
- HINSTANCE handle;
- long lwindow_handle;
typedef BOOL (WINAPI *tPrintWindow)(HWND, HDC,UINT);
tPrintWindow pPrintWindow = 0;
gdImagePtr im;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.w32 gd.c php_gd.h
pajoye Tue Apr 17 15:11:56 2007 UTC
Modified files:
/php-src/ext/gd config.w32 gd.c php_gd.h
Log:
- add imagegrabwindow and imagegrabscreen (win32 only)
capture a window using its handle or a full screen
optional bbox and to/from clipboard will follow shortly
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.23r2=1.24diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.23 php-src/ext/gd/config.w32:1.24
--- php-src/ext/gd/config.w32:1.23 Wed Apr 11 11:45:19 2007
+++ php-src/ext/gd/config.w32 Tue Apr 17 15:11:56 2007
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.23 2007/04/11 11:45:19 pajoye Exp $
+// $Id: config.w32,v 1.24 2007/04/17 15:11:56 pajoye Exp $
// vim:ft=javascript
ARG_WITH(gd, Bundled GD support, yes,shared);
@@ -24,6 +24,9 @@
CHECK_LIB(zlib.lib, gd, PHP_GD);
}
+ CHECK_LIB(User32.lib, gd, PHP_GD);
+ CHECK_LIB(Gdi32.lib, gd, PHP_GD);
+
EXTENSION(gd, gd.c, null, -Iext/gd/libgd, php_gd2.dll);
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 \
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.369r2=1.370diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.369 php-src/ext/gd/gd.c:1.370
--- php-src/ext/gd/gd.c:1.369 Thu Apr 5 09:32:58 2007
+++ php-src/ext/gd/gd.c Tue Apr 17 15:11:56 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.369 2007/04/05 09:32:58 tony2001 Exp $ */
+/* $Id: gd.c,v 1.370 2007/04/17 15:11:56 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -53,6 +53,9 @@
#ifdef PHP_WIN32
# include io.h
# include fcntl.h
+# include windows.h
+# include Winuser.h
+# include Wingdi.h
#endif
#if HAVE_LIBGD
@@ -277,6 +280,17 @@
ZEND_ARG_INFO(0, src_h)
ZEND_END_ARG_INFO()
+#ifdef PHP_WIN32
+static
+ZEND_BEGIN_ARG_INFO(arginfo_imagegrabwindow, 0)
+ ZEND_ARG_INFO(0, handle)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_imagegrabscreen, 0)
+ZEND_END_ARG_INFO()
+#endif
+
#ifdef HAVE_GD_BUNDLED
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_imagerotate, 0, 0, 3)
@@ -961,6 +975,11 @@
PHP_FE(imagecolorexactalpha,
arginfo_imagecolorexactalpha)
PHP_FE(imagecopyresampled,
arginfo_imagecopyresampled)
+#ifdef PHP_WIN32
+ PHP_FE(imagegrabwindow,
arginfo_imagegrabwindow)
+ PHP_FE(imagegrabscreen,
arginfo_imagegrabscreen)
+#endif
+
#ifdef HAVE_GD_BUNDLED
PHP_FE(imagerotate,
arginfo_imagerotate)
PHP_FE(imageantialias,
arginfo_imageantialias)
@@ -1854,6 +1873,155 @@
}
/* }}} */
+#ifdef PHP_WIN32
+/* {{{ proto resource imagegrabwindow(int window_handle [, int client_area])
+ Grab a window or its client area using a windows handle (HWND property in
COM instance) */
+PHP_FUNCTION(imagegrabwindow)
+{
+ HWND window;
+ long client_area = 0;
+ RECT rc = {0};
+ RECT rc_win = {0};
+ int Width, Height;
+ HDC hdc;
+ HDC memDC;
+ HBITMAP memBM;
+ HBITMAP hOld;
+ HINSTANCE handle;
+ long lwindow_handle;
+ typedef BOOL (WINAPI *tPrintWindow)(HWND, HDC,UINT);
+ tPrintWindow pPrintWindow = 0;
+ gdImagePtr im;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, l|l,
lwindow_handle, client_area) == FAILURE) {
+ RETURN_FALSE;
+ }
+
+ window = (HWND) lwindow_handle;
+
+ if (!IsWindow(window)) {
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, Invalid window
handle);
+ RETURN_FALSE;
+ }
+
+ hdc = GetDC(0);
+
+ if (client_area) {
+ GetClientRect(window, rc);
+ Width = rc.right;
+ Height = rc.bottom;
+ } else {
+ GetWindowRect(window, rc);
+ Width = rc.right - rc.left;
+ Height = rc.bottom - rc.top;
+ }
+
+ Width = (Width/4)*4;
+
+ memDC = CreateCompatibleDC(hdc);
+ memBM = CreateCompatibleBitmap(hdc, Width, Height);
+ hOld= (HBITMAP) SelectObject (memDC, memBM);
+
+
+ handle = LoadLibrary(User32.dll);
+ if ( handle == 0 ) {
+ goto clean;
+ }
+ pPrintWindow = (tPrintWindow) GetProcAddress(handle, PrintWindow);
+
+ if ( pPrintWindow ) {
+ pPrintWindow(window, memDC, (UINT) client_area);
+ } else {
+
[PHP-CVS] cvs: php-src /ext/gd config.w32
pajoye Wed Apr 11 11:45:19 2007 UTC Modified files: /php-src/ext/gd config.w32 Log: - add HAVE_GD_FONTMUTEX and HAVE_GD_FONTCACHESHUTDOWN to win32 build http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.22r2=1.23diff_format=u Index: php-src/ext/gd/config.w32 diff -u php-src/ext/gd/config.w32:1.22 php-src/ext/gd/config.w32:1.23 --- php-src/ext/gd/config.w32:1.22 Fri Apr 6 15:42:27 2007 +++ php-src/ext/gd/config.w32 Wed Apr 11 11:45:19 2007 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.22 2007/04/06 15:42:27 pajoye Exp $ +// $Id: config.w32,v 1.23 2007/04/11 11:45:19 pajoye Exp $ // vim:ft=javascript ARG_WITH(gd, Bundled GD support, yes,shared); @@ -39,6 +39,8 @@ /D HAVE_GD_IMAGESETTILE=1 \ /D HAVE_GD_FONTMUTEX=1 \ /D HAVE_LIBFREETYPE=1 \ +/D HAVE_GD_FONTCACHESHUTDOWN=1 \ +/D HAVE_GD_FONTMUTEX=1 \ /D HAVE_GD_JPG \ /D HAVE_GD_PNG \ /D HAVE_GD_STRINGFTEX=1 \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.w32 gd.c gd.dsp
pajoye Mon Dec 26 20:34:43 2005 EDT
Modified files:
/php-src/ext/gd config.w32 gd.c gd.dsp
Log:
- remove USE_GD_IOCTX, both bundled and extern lib use IOCTX
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/config.w32?r1=1.16r2=1.17diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.16 php-src/ext/gd/config.w32:1.17
--- php-src/ext/gd/config.w32:1.16 Thu Dec 22 23:25:05 2005
+++ php-src/ext/gd/config.w32 Mon Dec 26 20:34:42 2005
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.16 2005/12/22 23:25:05 pajoye Exp $
+// $Id: config.w32,v 1.17 2005/12/26 20:34:42 pajoye Exp $
// vim:ft=javascript
ARG_WITH(gd, Bundled GD support, yes,shared);
@@ -49,7 +49,6 @@
/D HAVE_LIBJPEG \
/D HAVE_LIBPNG \
/D USE_GD_IMGSTRTTF \
-/D USE_GD_IOCTX \
/D MSWIN32 \
);
} else {
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/gd.c?r1=1.331r2=1.332diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.331 php-src/ext/gd/gd.c:1.332
--- php-src/ext/gd/gd.c:1.331 Sun Dec 25 20:32:25 2005
+++ php-src/ext/gd/gd.c Mon Dec 26 20:34:42 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.331 2005/12/25 20:32:25 pajoye Exp $ */
+/* $Id: gd.c,v 1.332 2005/12/26 20:34:42 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -82,21 +82,7 @@
static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int, int);
#endif
-#define USE_GD_IOCTX 1
-
-#ifdef USE_GD_IOCTX
#include gd_ctx.c
-#else
-#define gdImageCreateFromGdCtx NULL
-#define gdImageCreateFromGd2Ctx NULL
-#define gdImageCreateFromGd2partCtx NULL
-#define gdImageCreateFromGifCtx NULL
-#define gdImageCreateFromJpegCtxNULL
-#define gdImageCreateFromPngCtx NULL
-#define gdImageCreateFromWBMPCtxNULL
-typedef FILE gdIOCtx;
-#define CTX_PUTC(c, fp) fputc(c, fp)
-#endif
#if HAVE_COLORCLOSESTHWB
int gdImageColorClosestHWB(gdImagePtr im, int r, int g, int b);
@@ -1407,17 +1393,13 @@
RETURN_FALSE;
}
-#ifndef USE_GD_IOCTX
- ioctx_func_p = NULL; /* don't allow sockets without IOCtx */
-#endif
-
/* try and avoid allocating a FILE* if the stream is not naturally a
FILE* */
if (php_stream_is(stream, PHP_STREAM_IS_STDIO)) {
if (FAILURE == php_stream_cast(stream, PHP_STREAM_AS_STDIO,
(void**)fp, REPORT_ERRORS)) {
goto out_err;
}
} else if (ioctx_func_p) {
-#ifdef USE_GD_IOCTX
+
/* we can create an io context */
gdIOCtx* io_ctx;
size_t buff_size;
@@ -1447,10 +1429,7 @@
#else
io_ctx-free(io_ctx);
#endif
-
-#endif
- }
- else {
+ } else {
/* try and force the stream to be FILE* */
if (FAILURE == php_stream_cast(stream, PHP_STREAM_AS_STDIO |
PHP_STREAM_CAST_TRY_HARD, (void **) fp, REPORT_ERRORS)) {
goto out_err;
@@ -1739,11 +1718,7 @@
Output PNG image to browser or file */
PHP_FUNCTION(imagepng)
{
-#ifdef USE_GD_IOCTX
_php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU,
PHP_GDIMG_TYPE_PNG, PNG, gdImagePngCtxEx);
-#else
- _php_image_output(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_PNG,
PNG, gdImagePng);
-#endif
}
/* }}} */
#endif /* HAVE_GD_PNG */
@@ -1753,11 +1728,7 @@
Output JPEG image to browser or file */
PHP_FUNCTION(imagejpeg)
{
-#ifdef USE_GD_IOCTX
_php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU,
PHP_GDIMG_TYPE_JPG, JPEG, gdImageJpegCtx);
-#else
- _php_image_output(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_JPG,
JPEG, gdImageJpeg);
-#endif
}
/* }}} */
#endif /* HAVE_GD_JPG */
@@ -1766,11 +1737,7 @@
Output WBMP image to browser or file */
PHP_FUNCTION(imagewbmp)
{
-#ifdef USE_GD_IOCTX
_php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU,
PHP_GDIMG_TYPE_WBM, WBMP, gdImageWBMPCtx);
-#else
- _php_image_output(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_WBM,
WBMP, gdImageWBMP);
-#endif
}
/* }}} */
@@ -3623,12 +3590,7 @@
gdImageSetPixel (im_dest, x, y, color);
}
}
-#ifdef USE_GD_IOCTX
gdImageWBMPCtx (im_dest, black, out);
-#else
- gdImageWBMP (im_dest, black, out);
-#endif
-
}
/* }}} */
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/gd.dsp?r1=1.24r2=1.25diff_format=u
Index: php-src/ext/gd/gd.dsp
diff -u php-src/ext/gd/gd.dsp:1.24 php-src/ext/gd/gd.dsp:1.25
--- php-src/ext/gd/gd.dsp:1.24 Thu Dec 22 23:25:06 2005
+++ php-src/ext/gd/gd.dsp Mon Dec 26 20:34:42 2005
@@ -44,7 +44,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I
..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\..\zlib /I ..\..\TSRM /D
ZEND_DEBUG=0 /D WIN32
[PHP-CVS] cvs: php-src /ext/gd config.w32 gd.dsp
pajoye Thu Dec 22 23:25:06 2005 EDT Modified files: /php-src/ext/gd config.w32 gd.dsp Log: - remove HAVE_GDIMAGECOLORRESOLVE here too (w32) http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/config.w32?r1=1.15r2=1.16diff_format=u Index: php-src/ext/gd/config.w32 diff -u php-src/ext/gd/config.w32:1.15 php-src/ext/gd/config.w32:1.16 --- php-src/ext/gd/config.w32:1.15 Fri Dec 16 19:21:55 2005 +++ php-src/ext/gd/config.w32 Thu Dec 22 23:25:05 2005 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.15 2005/12/16 19:21:55 pajoye Exp $ +// $Id: config.w32,v 1.16 2005/12/22 23:25:05 pajoye Exp $ // vim:ft=javascript ARG_WITH(gd, Bundled GD support, yes,shared); @@ -36,7 +36,6 @@ /D HAVE_GD_BUNDLED=1 \ /D HAVE_GD_GIF_READ=1 \ /D HAVE_GD_GIF_CREATE=1 \ -/D HAVE_GDIMAGECOLORRESOLVE=1 \ /D HAVE_GD_IMAGESETBRUSH=1 \ /D HAVE_GD_IMAGESETTILE=1 \ /D HAVE_GD_JPG \ http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/gd.dsp?r1=1.23r2=1.24diff_format=u Index: php-src/ext/gd/gd.dsp diff -u php-src/ext/gd/gd.dsp:1.23 php-src/ext/gd/gd.dsp:1.24 --- php-src/ext/gd/gd.dsp:1.23 Fri Dec 16 19:21:55 2005 +++ php-src/ext/gd/gd.dsp Thu Dec 22 23:25:06 2005 @@ -43,8 +43,8 @@ # PROP Intermediate_Dir Release_TS # PROP Ignore_Export_Lib 0 # PROP Target_Dir -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\..\zlib /I ..\..\TSRM /D ZEND_DEBUG=0 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GD_GIF_READ=1 /D HAVE_GD_GIF_CREATE=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_GD_XBM /D HAVE_LIBGD=1 /D HAVE_LIBGD204=1 /FR /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\..\zlib /I ..\..\TSRM /I libgd /D ZEND_DEBUG=0 /D HAVE_LIBGD204=1 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GD_GIF_READ=1 /D HAVE_GD_GIF_CREATE=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_GD_XBM /D HAVE_LIBGD=1 /D HAVE_LIBGD20=1 /D USE_GD_IOCTX /D HAVE_LIBFREETYPE=1 /D USE_GD_IMGSTRTTF /D HAVE_GD_STRINGTTF=1 /D HAVE_GD_BUNDLED=1 /D MSWIN32 /D HAVE_LIBPNG /D HAVE_LIBJPEG /D HAVE_GD_STRINGFTEX=1 /D HAVE_GD_IMAGESETBRUSH=1 /D HAVE_GD_IMAGESETTILE=1 /FR /FD /c +# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\..\zlib /I ..\..\TSRM /D ZEND_DEBUG=0 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GD_GIF_READ=1 /D HAVE_GD_GIF_CREATE=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_GD_XBM /D HAVE_LIBGD=1 /D HAVE_LIBGD204=1 /FR /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\..\zlib /I ..\..\TSRM /I libgd /D ZEND_DEBUG=0 /D HAVE_LIBGD204=1 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GD_GIF_READ=1 /D HAVE_GD_GIF_CREATE=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_GD_XBM /D HAVE_LIBGD=1 /D HAVE_LIBGD20=1 /D USE_GD_IOCTX /D HAVE_LIBFREETYPE=1 /D USE_GD_IMGSTRTTF /D HAVE_GD_STRINGTTF=1 /D HAVE_GD_BUNDLED=1 /D MSWIN32 /D HAVE_LIBPNG /D HAVE_LIBJPEG /D HAVE_GD_STRINGFTEX=1 /D HAVE_GD_IMAGESETBRUSH=1 /D HAVE_GD_IMAGESETTILE=1 /FR /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 @@ -73,8 +73,8 @@ # PROP Intermediate_Dir Debug_TS # PROP Ignore_Export_Lib 0 # PROP Target_Dir -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\..\zlib /I ..\..\TSRM /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GD_GIF_READ=1 /D HAVE_GD_GIF_CREATE=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_LIBGD=1 /D HAVE_LIBGD204=1 /FR /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\..\zlib /I ..\..\TSRM /I libgd /D ZEND_DEBUG=1 /D HAVE_LIBGD204=1 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GD_GIF_READ=1 /D HAVE_GD_GIF_CREATE=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_LIBGD=1 /D HAVE_LIBGD20=1 /D USE_GD_IOCTX /D HAVE_LIBFREETYPE=1 /D USE_GD_IMGSTRTTF /D HAVE_GD_STRINGTTF=1 /D HAVE_GD_BUNDLED=1 /D MSWIN32 /D HAVE_LIBPNG /D HAVE_LIBJPEG /D HAVE_GD_STRINGFTEX=1 /D HAVE_GD_IMAGESETBRUSH=1 /D HAVE_GD_IMAGESETTILE=1 /FR /FD /c +# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\..\zlib /I ..\..\TSRM /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GD_GIF_READ=1 /D HAVE_GD_GIF_CREATE=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_LIBGD=1 /D HAVE_LIBGD204=1 /FR /YX /FD /c +# ADD CPP
[PHP-CVS] cvs: php-src /ext/gd config.w32 gd.dsp
pajoye Wed Dec 14 19:12:58 2005 EDT Modified files: /php-src/ext/gd config.w32 gd.dsp Log: - remove HAVE_GD_GD2 on windows as well http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/config.w32?r1=1.11r2=1.12diff_format=u Index: php-src/ext/gd/config.w32 diff -u php-src/ext/gd/config.w32:1.11 php-src/ext/gd/config.w32:1.12 --- php-src/ext/gd/config.w32:1.11 Sun Oct 2 18:31:37 2005 +++ php-src/ext/gd/config.w32 Wed Dec 14 19:12:57 2005 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.11 2005/10/02 18:31:37 pajoye Exp $ +// $Id: config.w32,v 1.12 2005/12/14 19:12:57 pajoye Exp $ // vim:ft=javascript ARG_WITH(gd, Bundled GD support, yes,shared); @@ -34,7 +34,6 @@ ADD_FLAG(CFLAGS_GD, \ /D HAVE_GD_DYNAMIC_CTX_EX=1 \ /D HAVE_GD_BUNDLED=1 \ -/D HAVE_GD_GD2 \ /D HAVE_GD_GIF_READ=1 \ /D HAVE_GD_GIF_CREATE=1 \ /D HAVE_GDIMAGECOLORRESOLVE=1 \ http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/gd.dsp?r1=1.19r2=1.20diff_format=u Index: php-src/ext/gd/gd.dsp diff -u php-src/ext/gd/gd.dsp:1.19 php-src/ext/gd/gd.dsp:1.20 --- php-src/ext/gd/gd.dsp:1.19 Sun Apr 10 19:07:15 2005 +++ php-src/ext/gd/gd.dsp Wed Dec 14 19:12:57 2005 @@ -44,7 +44,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\..\zlib /I ..\..\TSRM /D ZEND_DEBUG=0 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GD_GIF_READ=1 /D HAVE_GD_GIF_CREATE=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_GD_XBM /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D HAVE_LIBGD15=1 /D HAVE_LIBGD204=1 /FR /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\..\zlib /I ..\..\TSRM /I libgd /D ZEND_DEBUG=0 /D HAVE_LIBGD15=1 /D HAVE_LIBGD204=1 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GD_GIF_READ=1 /D HAVE_GD_GIF_CREATE=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_GD_XBM /D HAVE_LIBGD=1 /D HAVE_LIBGD13=1 /D HAVE_LIBGD20=1 /D USE_GD_IOCTX /D HAVE_LIBFREETYPE=1 /D USE_GD_IMGSTRTTF /D HAVE_GD_STRINGTTF=1 /D HAVE_GD_BUNDLED=1 /D MSWIN32 /D HAVE_LIBPNG /D HAVE_LIBJPEG /D HAVE_GD_GD2 /D HAVE_GD_STRINGFTEX=1 /D HAVE_GD_IMAGESETBRUSH=1 /D HAVE_GD_IMAGESETTILE=1 /FR /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\..\zlib /I ..\..\TSRM /I libgd /D ZEND_DEBUG=0 /D HAVE_LIBGD15=1 /D HAVE_LIBGD204=1 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GD_GIF_READ=1 /D HAVE_GD_GIF_CREATE=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_GD_XBM /D HAVE_LIBGD=1 /D HAVE_LIBGD13=1 /D HAVE_LIBGD20=1 /D USE_GD_IOCTX /D HAVE_LIBFREETYPE=1 /D USE_GD_IMGSTRTTF /D HAVE_GD_STRINGTTF=1 /D HAVE_GD_BUNDLED=1 /D MSWIN32 /D HAVE_LIBPNG /D HAVE_LIBJPEG /D HAVE_GD_STRINGFTEX=1 /D HAVE_GD_IMAGESETBRUSH=1 /D HAVE_GD_IMAGESETTILE=1 /FR /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 @@ -74,7 +74,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\..\zlib /I ..\..\TSRM /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GD_GIF_READ=1 /D HAVE_GD_GIF_CREATE=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D HAVE_LIBGD15=1 /D HAVE_LIBGD204=1 /FR /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\..\zlib /I ..\..\TSRM /I libgd /D ZEND_DEBUG=1 /D HAVE_LIBGD15 /D HAVE_LIBGD204=1 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GD_GIF_READ=1 /D HAVE_GD_GIF_CREATE=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_LIBGD=1 /D HAVE_LIBGD13=1 /D HAVE_LIBGD20=1 /D USE_GD_IOCTX /D HAVE_LIBFREETYPE=1 /D USE_GD_IMGSTRTTF /D HAVE_GD_STRINGTTF=1 /D HAVE_GD_BUNDLED=1 /D MSWIN32 /D HAVE_LIBPNG /D HAVE_LIBJPEG /D HAVE_GD_GD2 /D HAVE_GD_STRINGFTEX=1 /D HAVE_GD_IMAGESETBRUSH=1 /D HAVE_GD_IMAGESETTILE=1 /FR /FD /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\..\zlib /I ..\..\TSRM /I libgd /D ZEND_DEBUG=1 /D HAVE_LIBGD15 /D HAVE_LIBGD204=1 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GD_GIF_READ=1 /D HAVE_GD_GIF_CREATE=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_LIBGD=1 /D HAVE_LIBGD13=1 /D HAVE_LIBGD20=1 /D USE_GD_IOCTX /D HAVE_LIBFREETYPE=1 /D
[PHP-CVS] cvs: php-src /ext/gd config.w32
pajoye Sun Oct 2 14:31:38 2005 EDT Modified files: /php-src/ext/gd config.w32 Log: - remove gdttf http://cvs.php.net/diff.php/php-src/ext/gd/config.w32?r1=1.10r2=1.11ty=u Index: php-src/ext/gd/config.w32 diff -u php-src/ext/gd/config.w32:1.10 php-src/ext/gd/config.w32:1.11 --- php-src/ext/gd/config.w32:1.10 Sun Aug 7 17:00:28 2005 +++ php-src/ext/gd/config.w32 Sun Oct 2 14:31:37 2005 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.10 2005/08/07 21:00:28 sniper Exp $ +// $Id: config.w32,v 1.11 2005/10/02 18:31:37 pajoye Exp $ // vim:ft=javascript ARG_WITH(gd, Bundled GD support, yes,shared); @@ -24,7 +24,7 @@ CHECK_LIB(zlib.lib, gd, PHP_GD); } - EXTENSION(gd, gd.c gdttf.c, null, -Iext/gd/libgd, php_gd2.dll); + EXTENSION(gd, gd.c, null, -Iext/gd/libgd, php_gd2.dll); 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 gd_gif_out.c gdhelpers.c gd_io.c gd_io_dp.c \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.w32
sniper Sun Aug 7 17:00:30 2005 EDT
Modified files:
/php-src/ext/gd config.w32
Log:
Missing entry
http://cvs.php.net/diff.php/php-src/ext/gd/config.w32?r1=1.9r2=1.10ty=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.9 php-src/ext/gd/config.w32:1.10
--- php-src/ext/gd/config.w32:1.9 Sat Aug 6 18:20:06 2005
+++ php-src/ext/gd/config.w32 Sun Aug 7 17:00:28 2005
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.9 2005/08/06 22:20:06 edink Exp $
+// $Id: config.w32,v 1.10 2005/08/07 21:00:28 sniper Exp $
// vim:ft=javascript
ARG_WITH(gd, Bundled GD support, yes,shared);
@@ -32,6 +32,7 @@
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_DYNAMIC_CTX_EX=1 \
/D HAVE_GD_BUNDLED=1 \
/D HAVE_GD_GD2 \
/D HAVE_GD_GIF_READ=1 \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.w32
edink Sat Aug 6 18:20:06 2005 EDT
Modified files:
/php-src/ext/gd config.w32
Log:
Only link zlib if we dont compile it in (#3406)
http://cvs.php.net/diff.php/php-src/ext/gd/config.w32?r1=1.8r2=1.9ty=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.8 php-src/ext/gd/config.w32:1.9
--- php-src/ext/gd/config.w32:1.8 Mon Aug 1 17:57:08 2005
+++ php-src/ext/gd/config.w32 Sat Aug 6 18:20:06 2005
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.8 2005/08/01 21:57:08 edink Exp $
+// $Id: config.w32,v 1.9 2005/08/06 22:20:06 edink Exp $
// vim:ft=javascript
ARG_WITH(gd, Bundled GD support, yes,shared);
@@ -8,7 +8,6 @@
if (CHECK_LIB(libjpeg.lib, gd, PHP_GD)
CHECK_LIB(freetype2.lib, gd, PHP_GD)
CHECK_LIB(libpng.lib, gd, PHP_GD)
- CHECK_LIB(zlib.lib, gd, PHP_GD + ;..\\zlib; +
php_usual_lib_suspects)
CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, PHP_GD +
;ext\\gd\\libgd)
) {
if (PHP_T1LIB != no) {
@@ -21,6 +20,10 @@
}
}
+ if (PHP_ZLIB == no || PHP_ZLIB_SHARED) {
+ CHECK_LIB(zlib.lib, gd, PHP_GD);
+ }
+
EXTENSION(gd, gd.c gdttf.c, null, -Iext/gd/libgd,
php_gd2.dll);
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 \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.w32 /win32/build confutils.js
edink Mon Aug 1 17:57:10 2005 EDT
Modified files:
/php-src/ext/gd config.w32
/php-src/win32/buildconfutils.js
Log:
Allow building gd on windows systems without t1lib (M. Sisolak) #33620
http://cvs.php.net/diff.php/php-src/ext/gd/config.w32?r1=1.7r2=1.8ty=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.7 php-src/ext/gd/config.w32:1.8
--- php-src/ext/gd/config.w32:1.7 Mon Apr 25 05:08:48 2005
+++ php-src/ext/gd/config.w32 Mon Aug 1 17:57:08 2005
@@ -1,17 +1,25 @@
-// $Id: config.w32,v 1.7 2005/04/25 09:08:48 edink Exp $
+// $Id: config.w32,v 1.8 2005/08/01 21:57:08 edink 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.lib, gd, PHP_GD)
CHECK_LIB(freetype2.lib, gd, PHP_GD)
CHECK_LIB(libpng.lib, gd, PHP_GD)
- CHECK_LIB(T1_StaticMD.lib, gd, PHP_GD)
CHECK_LIB(zlib.lib, gd, PHP_GD + ;..\\zlib; +
php_usual_lib_suspects)
- CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, PHP_GD +
;ext\\gd\\libgd)
- CHECK_HEADER_ADD_INCLUDE(t1lib.h, CFLAGS_GD, PHP_GD + ; +
PHP_PHP_BUILD + \\include\\t1lib)
+ CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, PHP_GD +
;ext\\gd\\libgd)
) {
+ if (PHP_T1LIB != no) {
+ if (CHECK_LIB(T1_StaticMD.lib, gd, PHP_GD)
+ CHECK_HEADER_ADD_INCLUDE(t1lib.h,
CFLAGS_GD, PHP_GD + ; + PHP_PHP_BUILD + \\include\\t1lib)
+ ) {
+ ADD_FLAG(CFLAGS_GD, /D HAVE_LIBT1);
+ } else {
+ WARNING(t1lib not enabled; libraries and
headers not found);
+ }
+ }
EXTENSION(gd, gd.c gdttf.c, null, -Iext/gd/libgd,
php_gd2.dll);
ADD_SOURCES(ext/gd/libgd, gd2copypal.c gd_arc_f_buggy.c gd.c
\
@@ -43,7 +51,6 @@
/D HAVE_LIBPNG \
/D USE_GD_IMGSTRTTF \
/D USE_GD_IOCTX \
-/D HAVE_LIBT1 \
/D MSWIN32 \
);
} else {
http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.58r2=1.59ty=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.58
php-src/win32/build/confutils.js:1.59
--- php-src/win32/build/confutils.js:1.58 Thu Jul 7 09:22:38 2005
+++ php-src/win32/build/confutils.jsMon Aug 1 17:57:09 2005
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.58 2005/07/07 13:22:38 wez Exp $
+// $Id: confutils.js,v 1.59 2005/08/01 21:57:09 edink Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -350,7 +350,7 @@
'php-build', 'snapshot-template',
'pcre-regex', 'fastcgi', 'force-cgi-redirect',
'path-info-check', 'zts', 'ipv6', 'memory-limit',
-'zend-multibyte', 'fd-setsize', 'memory-manager'
+'zend-multibyte', 'fd-setsize', 'memory-manager', 't1lib'
);
var force;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.w32
edink Mon Apr 25 05:08:49 2005 EDT
Modified files:
/php-src/ext/gd config.w32
Log:
Added T1LIB support on Windows (#32809)
http://cvs.php.net/diff.php/php-src/ext/gd/config.w32?r1=1.6r2=1.7ty=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.6 php-src/ext/gd/config.w32:1.7
--- php-src/ext/gd/config.w32:1.6 Thu Jul 22 18:38:59 2004
+++ php-src/ext/gd/config.w32 Mon Apr 25 05:08:48 2005
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.6 2004/07/22 22:38:59 sesser Exp $
+// $Id: config.w32,v 1.7 2005/04/25 09:08:48 edink Exp $
// vim:ft=javascript
ARG_WITH(gd, Bundled GD support, yes,shared);
@@ -7,8 +7,11 @@
if (CHECK_LIB(libjpeg.lib, gd, PHP_GD)
CHECK_LIB(freetype2.lib, gd, PHP_GD)
CHECK_LIB(libpng.lib, gd, PHP_GD)
+ CHECK_LIB(T1_StaticMD.lib, gd, PHP_GD)
CHECK_LIB(zlib.lib, gd, PHP_GD + ;..\\zlib; +
php_usual_lib_suspects)
- CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, PHP_GD +
;ext\\gd\\libgd)) {
+ CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, PHP_GD +
;ext\\gd\\libgd)
+ CHECK_HEADER_ADD_INCLUDE(t1lib.h, CFLAGS_GD, PHP_GD + ; +
PHP_PHP_BUILD + \\include\\t1lib)
+ ) {
EXTENSION(gd, gd.c gdttf.c, null, -Iext/gd/libgd,
php_gd2.dll);
ADD_SOURCES(ext/gd/libgd, gd2copypal.c gd_arc_f_buggy.c gd.c
\
@@ -40,6 +43,7 @@
/D HAVE_LIBPNG \
/D USE_GD_IMGSTRTTF \
/D USE_GD_IOCTX \
+/D HAVE_LIBT1 \
/D MSWIN32 \
);
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.w32 /win32/build Makefile
wez Wed Jan 7 18:36:37 2004 EDT
Modified files:
/php-src/ext/gd config.w32
/php-src/win32/buildMakefile
Log:
win32 build:
gd should build shared by default
don't use php.ini when running mkdist.php
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.4 php-src/ext/gd/config.w32:1.5
--- php-src/ext/gd/config.w32:1.4 Wed Dec 31 14:28:31 2003
+++ php-src/ext/gd/config.w32 Wed Jan 7 18:36:34 2004
@@ -1,7 +1,7 @@
-// $Id: config.w32,v 1.4 2003/12/31 19:28:31 fmk Exp $
+// $Id: config.w32,v 1.5 2004/01/07 23:36:34 wez Exp $
// vim:ft=javascript
-ARG_WITH(gd, Bundled GD support, yes);
+ARG_WITH(gd, Bundled GD support, yes,shared);
if (PHP_GD != no) {
if (CHECK_LIB(libjpeg.lib, gd, PHP_GD)
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.13 php-src/win32/build/Makefile:1.14
--- php-src/win32/build/Makefile:1.13 Wed Jan 7 18:11:54 2004
+++ php-src/win32/build/MakefileWed Jan 7 18:36:36 2004
@@ -14,7 +14,7 @@
# | Author: Wez Furlong [EMAIL PROTECTED] |
# +--+
#
-# $Id: Makefile,v 1.13 2004/01/07 23:11:54 wez Exp $
+# $Id: Makefile,v 1.14 2004/01/07 23:36:36 wez Exp $
# This is the makefile template for the win32 build
CC=$(CL)
@@ -88,7 +88,7 @@
build-dist: $(BUILD_DIR)\deplister.exe
-rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-del /f /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING).zip
- $(BUILD_DIR)\php.exe win32/build/mkdist.php $(BUILD_DIR) $(PHPDLL)
$(SAPI_TARGETS) $(EXT_TARGETS) $(SNAPSHOT_TEMPLATE)
+ $(BUILD_DIR)\php.exe -n win32/build/mkdist.php $(BUILD_DIR) $(PHPDLL)
$(SAPI_TARGETS) $(EXT_TARGETS) $(SNAPSHOT_TEMPLATE)
cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-$(ZIP) -9 -r ..\php-$(PHP_VERSION_STRING).zip .
cd ..\..
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.w32
fmk Wed Dec 31 14:28:32 2003 EDT
Modified files:
/php-src/ext/gd config.w32
Log:
Make sure zlib.lib is found
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.3 php-src/ext/gd/config.w32:1.4
--- php-src/ext/gd/config.w32:1.3 Mon Dec 22 17:33:42 2003
+++ php-src/ext/gd/config.w32 Wed Dec 31 14:28:31 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.3 2003/12/22 22:33:42 wez Exp $
+// $Id: config.w32,v 1.4 2003/12/31 19:28:31 fmk Exp $
// vim:ft=javascript
ARG_WITH(gd, Bundled GD support, yes);
@@ -7,7 +7,7 @@
if (CHECK_LIB(libjpeg.lib, gd, PHP_GD)
CHECK_LIB(freetype2.lib, gd, PHP_GD)
CHECK_LIB(libpng.lib, gd, PHP_GD)
- CHECK_LIB(zlib.lib, gd, PHP_GD)
+ CHECK_LIB(zlib.lib, gd, PHP_GD + ;..\\zlib; +
php_usual_lib_suspects)
CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, PHP_GD +
;ext\\gd\\libgd)) {
EXTENSION(gd, gd.c gdttf.c, null, -Iext/gd/libgd, php_gd2.dll);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.w32 /win32/build confutils.js
wez Mon Dec 22 17:33:44 2003 EDT
Modified files:
/php-src/ext/gd config.w32
/php-src/win32/buildconfutils.js
Log:
For GD, build the extension as php_gd2.dll instead of php_gd.dll.
Thanks again Frank :-)
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.2 php-src/ext/gd/config.w32:1.3
--- php-src/ext/gd/config.w32:1.2 Sat Dec 6 21:58:55 2003
+++ php-src/ext/gd/config.w32 Mon Dec 22 17:33:42 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.2 2003/12/07 02:58:55 wez Exp $
+// $Id: config.w32,v 1.3 2003/12/22 22:33:42 wez Exp $
// vim:ft=javascript
ARG_WITH(gd, Bundled GD support, yes);
@@ -8,9 +8,9 @@
CHECK_LIB(freetype2.lib, gd, PHP_GD)
CHECK_LIB(libpng.lib, gd, PHP_GD)
CHECK_LIB(zlib.lib, gd, PHP_GD)
- CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, ext\\gd\\libgd; +
PHP_GD)) {
+ CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, PHP_GD +
;ext\\gd\\libgd)) {
- EXTENSION(gd, gd.c gdttf.c, null, -Iext/gd/libgd);
+ EXTENSION(gd, gd.c gdttf.c, null, -Iext/gd/libgd, php_gd2.dll);
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 \
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.24 php-src/win32/build/confutils.js:1.25
--- php-src/win32/build/confutils.js:1.24 Mon Dec 22 08:13:39 2003
+++ php-src/win32/build/confutils.jsMon Dec 22 17:33:43 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.24 2003/12/22 13:13:39 wez Exp $
+// $Id: confutils.js,v 1.25 2003/12/22 22:33:43 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -668,11 +668,10 @@
}
}
-function EXTENSION(extname, file_list, shared, cflags)
+function EXTENSION(extname, file_list, shared, cflags, dllname)
{
var objs = null;
var EXT = extname.toUpperCase();
- var dllname = false;
if (shared == null) {
eval(shared = PHP_ + EXT + _SHARED;);
@@ -699,10 +698,13 @@
MFO.WriteBlankLines(1);
if (shared) {
- dllname = php_ + extname + .dll;
+ if (dllname == null) {
+ dllname = php_ + extname + .dll;
+ }
+ var libname = dllname.substring(0, dllname.length-4) + .lib;
+
var resname = generate_version_info_resource(dllname,
configure_module_dirname);
var ld = $(LD);
- var libname = php_ + extname + .lib;
MFO.WriteLine($(BUILD_DIR)\\ + dllname + $(BUILD_DIR)\\ + libname
+ : $(DEPS_ + EXT + ) $( + EXT + _GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB)
$(BUILD_DIR)\\ + resname);
MFO.WriteLine(\t + ld + /out:$(BUILD_DIR)\\ + dllname +
$(DLL_LDFLAGS) $(LDFLAGS) $(LDFLAGS_ + EXT + ) $( + EXT + _GLOBAL_OBJS)
$(BUILD_DIR)\\$(PHPLIB) $(LIBS_ + EXT + ) $(LIBS) $(BUILD_DIR)\\ + resname);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.w32
edink Sat Dec 6 20:59:28 2003 EDT
Added files:
/php-src/ext/gd config.w32
Log:
First attemt at win32 build with the new build system.
#No workie yet, the build sys needs tweaking
Index: php-src/ext/gd/config.w32
+++ php-src/ext/gd/config.w32
// $Id: config.w32,v 1.1 2003/12/07 01:59:28 edink Exp $
// vim:ft=javascript
ARG_WITH(gd, Bundled GD support, no);
if (PHP_GD != no) {
if (CHECK_LIB(libjpeg.lib, gd, PHP_GD)
CHECK_LIB(freetype2.lib, gd, PHP_GD)
CHECK_LIB(libpng.lib, gd, PHP_GD)
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);
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 \
);
} else {
WARNING(gd not enabled; libraries and headers not found);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.w32 /win32/build config.w32 confutils.js
wez Sat Dec 6 21:58:57 2003 EDT
Modified files:
/php-src/ext/gd config.w32
/php-src/win32/buildconfig.w32 confutils.js
Log:
tweak build so that it mirrors the source filesystem layout under the build dir.
This allows GD extension to build.
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.1 php-src/ext/gd/config.w32:1.2
--- php-src/ext/gd/config.w32:1.1 Sat Dec 6 20:59:28 2003
+++ php-src/ext/gd/config.w32 Sat Dec 6 21:58:55 2003
@@ -1,7 +1,7 @@
-// $Id: config.w32,v 1.1 2003/12/07 01:59:28 edink Exp $
+// $Id: config.w32,v 1.2 2003/12/07 02:58:55 wez Exp $
// 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 @@
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);
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.13 php-src/win32/build/config.w32:1.14
--- php-src/win32/build/config.w32:1.13 Sat Dec 6 11:14:03 2003
+++ php-src/win32/build/config.w32 Sat Dec 6 21:58:56 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.13 2003/12/06 16:14:03 wez Exp $
+// $Id: config.w32,v 1.14 2003/12/07 02:58:56 wez Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -95,6 +95,8 @@
PHP_PHP_BUILD = ..\\php_build;
} else if (FSO.FolderExists(..\\win32build)) {
PHP_PHP_BUILD = ..\\win32build;
+ } else if (FSO.FolderExists(..\\php-win32-dev\\php_build)) {
+ PHP_PHP_BUILD = ..\\php-win32-dev\\php_build;
}
}
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.18 php-src/win32/build/confutils.js:1.19
--- php-src/win32/build/confutils.js:1.18 Fri Dec 5 19:00:31 2003
+++ php-src/win32/build/confutils.jsSat Dec 6 21:58:56 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.18 2003/12/06 00:00:31 wez Exp $
+// $Id: confutils.js,v 1.19 2003/12/07 02:58:56 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -631,16 +631,26 @@
dir = dir.replace(new RegExp(/, g), \\);
+
Re: [PHP-CVS] cvs: php-src /ext/gd config.w32 /win32/build config.w32 confutils.js
I've started on imap, and only need to resolve a few linker conflicts. It
will be using imap-2002e.
- Frank
wez Sat Dec 6 21:58:57 2003 EDT
Modified files:
/php-src/ext/gd config.w32
/php-src/win32/build config.w32 confutils.js
Log:
tweak build so that it mirrors the source filesystem layout under the
build dir. This allows GD extension to build.
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.1 php-src/ext/gd/config.w32:1.2
--- php-src/ext/gd/config.w32:1.1 Sat Dec 6 20:59:28 2003
+++ php-src/ext/gd/config.w32 Sat Dec 6 21:58:55 2003
@@ -1,7 +1,7 @@
-// $Id: config.w32,v 1.1 2003/12/07 01:59:28 edink Exp $
+// $Id: config.w32,v 1.2 2003/12/07 02:58:55 wez Exp $
// 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 @@
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);
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.13
php-src/win32/build/config.w32:1.14
--- php-src/win32/build/config.w32:1.13 Sat Dec 6 11:14:03 2003
+++ php-src/win32/build/config.w32Sat Dec 6 21:58:56 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.13 2003/12/06 16:14:03 wez Exp $
+// $Id: config.w32,v 1.14 2003/12/07 02:58:56 wez Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -95,6 +95,8 @@
PHP_PHP_BUILD = ..\\php_build;
} else if (FSO.FolderExists(..\\win32build)) {
PHP_PHP_BUILD = ..\\win32build;
+ } else if (FSO.FolderExists(..\\php-win32-dev\\php_build)) {
+ PHP_PHP_BUILD = ..\\php-win32-dev\\php_build;
}
}
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.18
php-src/win32/build/confutils.js:1.19
--- php-src/win32/build/confutils.js:1.18 Fri Dec 5 19:00:31 2003
+++ php-src/win32/build/confutils.js Sat Dec 6 21:58:56 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.18 2003/12/06 00:00:31 wez Exp $
+// $Id: confutils.js,v 1.19 2003/12/07 02:58:56 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -631,16 +631,26 @@
dir = dir.replace(new RegExp(/, g), \\);
