wez Mon Dec 22 17:33:44 2003 EDT
Modified files:
/php-src/ext/gd config.w32
/php-src/win32/build confutils.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.js Mon 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
