fix a couple of buglets and set version number on DLLs to whatever the PHP major...

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 369317eb6453de89f9bd5cd2fa6728d2220906b0..800133466486b24aa1cfe8f22028a4f48d1cd6d4 100644 (file)
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -35,7 +35,7 @@ DEFINE("CFLAGS", "/nologo /YX /FD $(BASE_INCLUDES) /D _WINDOWS \
 DEFINE("LDFLAGS", "/nologo /libpath:$(PHP_BUILD)\\lib");
 
 // General DLL link flags
-DEFINE("DLL_LDFLAGS", "/dll");
+DEFINE("DLL_LDFLAGS", "/dll /version:" + PHP_VERSION);
 
 // PHP DLL link flags
 DEFINE("PHP_LDFLAGS", "$(DLL_LDFLAGS)");

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index a03f24834e03565c35209c1da86e0c9ccd9c1a57..155a842f3d8067430eb74068f92648182cc5cf91 100644 (file)
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-// $Id: confutils.js,v 1.11 2003-12-04 01:37:52 wez Exp $
+// $Id: confutils.js,v 1.12 2003-12-04 02:12:36 wez Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -530,7 +530,7 @@ function EXTENSION(extname, file_list, shared, cflags)
 
        if (shared) {
                dllname = "php_" + extname + ".dll";
-               var resname = generate_version_info_resource(makefiletarget, "ext/" + extname);
+               var resname = generate_version_info_resource(dllname, "ext/" + extname);
        
                MFO.WriteLine("$(BUILD_DIR)\\" + dllname + ": $(" + 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);

diff --git a/win32/build/template.rc b/win32/build/template.rc
index cf8b81e4c9ef4d91eab32ac6b8f7cf79a49492ec..61bff04a372529f57baac12d677da11b39e57500 100644 (file)
--- a/win32/build/template.rc
+++ b/win32/build/template.rc
@@ -5,7 +5,6 @@
 # error dont edit with MSVC
 #endif
 
-#include "resource.h"
 #include "winres.h"
 #include "main/php_version.h"