wez Wed Jan 7 18:36:37 2004 EDT
Modified files:
/php-src/ext/gd config.w32
/php-src/win32/build Makefile
Log:
win32 build:
gd should build shared by default
don't use php.ini when running mkdist.php
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.4 php-src/ext/gd/config.w32:1.5
--- php-src/ext/gd/config.w32:1.4 Wed Dec 31 14:28:31 2003
+++ php-src/ext/gd/config.w32 Wed Jan 7 18:36:34 2004
@@ -1,7 +1,7 @@
-// $Id: config.w32,v 1.4 2003/12/31 19:28:31 fmk Exp $
+// $Id: config.w32,v 1.5 2004/01/07 23:36:34 wez Exp $
// 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) &&
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.13 php-src/win32/build/Makefile:1.14
--- php-src/win32/build/Makefile:1.13 Wed Jan 7 18:11:54 2004
+++ php-src/win32/build/Makefile Wed Jan 7 18:36:36 2004
@@ -14,7 +14,7 @@
# | Author: Wez Furlong <[EMAIL PROTECTED]> |
# +----------------------------------------------------------------------+
#
-# $Id: Makefile,v 1.13 2004/01/07 23:11:54 wez Exp $
+# $Id: Makefile,v 1.14 2004/01/07 23:36:36 wez Exp $
# This is the makefile template for the win32 build
CC="$(CL)"
@@ -88,7 +88,7 @@
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 ..\..
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
