win32 build:

gd should build shared by default
don't use php.ini when running mkdist.php

diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
index 939b7b52bd89730325dbe0b20b132bfad1e05450..3d9b375a50c4b2c11604e1ac7bd2854b843becde 100644 (file)
--- a/ext/gd/config.w32
+++ b/ext/gd/config.w32
@@ -1,7 +1,7 @@
 // $Id$
 // vim:ft=javascript
 
-ARG_WITH("gd", "Bundled GD support", "yes");
+ARG_WITH("gd", "Bundled GD support", "yes,shared");
 
 if (PHP_GD != "no") {
        if (CHECK_LIB("libjpeg.lib", "gd", PHP_GD) &&

diff --git a/win32/build/Makefile b/win32/build/Makefile
index 507f2cdea7c02a844af8c91164d07c756bc13473..d0543dbf040301776a1d2b900fffc4e27837be29 100644 (file)
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@ -88,7 +88,7 @@ build-snap:
 build-dist: $(BUILD_DIR)\deplister.exe
        -rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
        -del /f /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING).zip
-       $(BUILD_DIR)\php.exe win32/build/mkdist.php "$(BUILD_DIR)" "$(PHPDLL)" "$(SAPI_TARGETS)" "$(EXT_TARGETS)" "$(SNAPSHOT_TEMPLATE)"
+       $(BUILD_DIR)\php.exe -n win32/build/mkdist.php "$(BUILD_DIR)" "$(PHPDLL)" "$(SAPI_TARGETS)" "$(EXT_TARGETS)" "$(SNAPSHOT_TEMPLATE)"
        cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
        -$(ZIP) -9 -r ..\php-$(PHP_VERSION_STRING).zip .
        cd ..\..