For GD, build the extension as php_gd2.dll instead of php_gd.dll.

Thanks again Frank :-)

diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
index c01568f7cae134f9afbf25ac2178ab4f9ef24b48..fe460cc379a7ae61e01c92199f792673e36dda69 100644 (file)
--- a/ext/gd/config.w32
+++ b/ext/gd/config.w32
@@ -8,9 +8,9 @@ if (PHP_GD != "no") {
                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 \

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index bd9c0ef4589be41ada279ee7957dca90deb3226d..fa6b425e00e9ec17d743c1c2e1f1a709babe83a1 100644 (file)
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -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 ADD_EXTENSION_DEP(extname, dependson)
        }
 }
 
-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 @@ function EXTENSION(extname, file_list, shared, cflags)
        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);