summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWez Furlong <wez@php.net>2004-01-07 23:36:36 +0000
committerWez Furlong <wez@php.net>2004-01-07 23:36:36 +0000
commit772875537f0a035950ebd2b28b64d57575cd633f (patch)
treeab6c47fe16853433669d5e84dd17f6511a02df6f
parentf5e4590fd5288a6ddbc5514d5f9d8518b97ff54c (diff)
downloadphp-git-772875537f0a035950ebd2b28b64d57575cd633f.tar.gz
win32 build:
gd should build shared by default don't use php.ini when running mkdist.php
-rw-r--r--ext/gd/config.w322
-rw-r--r--win32/build/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
index 939b7b52bd..3d9b375a50 100644
--- 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 507f2cdea7..d0543dbf04 100644
--- 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 ..\..