cvs: php-src(PHP_5_0) /ext/gd config.w32
| From: | Edin Kadribasic | Date: | Mon, 25 Apr 2005 09:10:14 +0000 |
| Subject: | cvs: php-src(PHP_5_0) /ext/gd config.w32 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-31576@lists.php.net to get a copy of this message | ||
edink Mon Apr 25 05:10:14 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/gd config.w32
Log:
MFH: Added T1LIB support on Windows (#32809)
http://cvs.php.net/diff.php/php-src/ext/gd/config.w32?r1=1.5.2.1&r2=1.5.2.2&ty=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.5.2.1 php-src/ext/gd/config.w32:1.5.2.2
--- php-src/ext/gd/config.w32:1.5.2.1 Thu Jul 22 18:59:11 2004
+++ php-src/ext/gd/config.w32 Mon Apr 25 05:10:14 2005
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.5.2.1 2004/07/22 22:59:11 sesser Exp $
+// $Id: config.w32,v 1.5.2.2 2005/04/25 09:10:14 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 {