diff options
| author | Wez Furlong <wez@php.net> | 2003-12-22 22:33:43 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2003-12-22 22:33:43 +0000 |
| commit | fc292fc2592c6d13418729e3e50c8a84ef9eded1 (patch) | |
| tree | b994d986a2d58bb10ed4e4d1ed1bb71525df7724 /win32 | |
| parent | f936f2983daf1c2636102de5b0a66c96fc3a6f9e (diff) | |
| download | php-git-fc292fc2592c6d13418729e3e50c8a84ef9eded1.tar.gz | |
For GD, build the extension as php_gd2.dll instead of php_gd.dll.
Thanks again Frank :-)
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/build/confutils.js | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js index bd9c0ef458..fa6b425e00 100644 --- 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); |