Mirrors
/
php
mirror of https://github.com/php/php-src
3
0
Fork 0
Code Releases Activity
Browse Source

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

Thanks again Frank :-)
PEAR_1_4DEV
Wez Furlong 23 years ago
parent
f936f2983d
commit
fc292fc259
2 changed files with 9 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      ext/gd/config.w32
  2. 12
      win32/build/confutils.js

4
ext/gd/config.w32
View File

@ -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 \

12
win32/build/confutils.js
View File

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

Write Preview
Loading…
Cancel
Save