wez Wed Dec 3 21:12:36 2003 EDT Modified files: /php-src/win32/build config.w32 confutils.js template.rc Log: fix a couple of buglets and set version number on DLLs to whatever the PHP major version is. Index: php-src/win32/build/config.w32 diff -u php-src/win32/build/config.w32:1.8 php-src/win32/build/config.w32:1.9 --- php-src/win32/build/config.w32:1.8 Wed Dec 3 17:59:48 2003 +++ php-src/win32/build/config.w32 Wed Dec 3 21:12:36 2003 @@ -1,5 +1,5 @@ // vim:ft=javascript -// $Id: config.w32,v 1.8 2003/12/03 22:59:48 wez Exp $ +// $Id: config.w32,v 1.9 2003/12/04 02:12:36 wez Exp $ // "Master" config file; think of it as a configure.in // equivalent. @@ -35,7 +35,7 @@ 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)"); Index: php-src/win32/build/confutils.js diff -u php-src/win32/build/confutils.js:1.11 php-src/win32/build/confutils.js:1.12 --- php-src/win32/build/confutils.js:1.11 Wed Dec 3 20:37:52 2003 +++ php-src/win32/build/confutils.js Wed Dec 3 21:12:36 2003 @@ -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 @@ 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); Index: php-src/win32/build/template.rc diff -u php-src/win32/build/template.rc:1.1 php-src/win32/build/template.rc:1.2 --- php-src/win32/build/template.rc:1.1 Wed Dec 3 20:37:52 2003 +++ php-src/win32/build/template.rc Wed Dec 3 21:12:36 2003 @@ -1,11 +1,10 @@ /* This is a template RC file. - * $Id: template.rc,v 1.1 2003/12/04 01:37:52 wez Exp $ + * $Id: template.rc,v 1.2 2003/12/04 02:12:36 wez Exp $ * Do not edit with MSVC */ #ifdef APSTUDIO_INVOKED # error dont edit with MSVC #endif -#include "resource.h" #include "winres.h" #include "main/php_version.h"
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php