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

This commit is contained in:
Wez Furlong 2003-12-04 02:12:36 +00:00
parent 5252f3faa9
commit 7e73ae1b5e
3 changed files with 3 additions and 4 deletions

View File

@ -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)");

View File

@ -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);

View File

@ -5,7 +5,6 @@
# error dont edit with MSVC
#endif
#include "resource.h"
#include "winres.h"
#include "main/php_version.h"