pajoye Fri Nov 21 14:18:27 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/win32/build Makefile config.w32
Log:
- MFH:
- expose PHP_BUILD in the Makefile
- ICU 3.8/4.0 are dynamically linked, add $PHP_BUILD\bin to the PATH so
php.exe can find them (nmake test, nmake snaps)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.35.2.1.2.6.2.9&r2=1.35.2.1.2.6.2.10&diff_format=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.35.2.1.2.6.2.9
php-src/win32/build/Makefile:1.35.2.1.2.6.2.10
--- php-src/win32/build/Makefile:1.35.2.1.2.6.2.9 Sun Oct 26 00:14:23 2008
+++ php-src/win32/build/Makefile Fri Nov 21 14:18:27 2008
@@ -14,7 +14,7 @@
# | Author: Wez Furlong <[EMAIL PROTECTED]> |
# +----------------------------------------------------------------------+
#
-# $Id: Makefile,v 1.35.2.1.2.6.2.9 2008/10/26 00:14:23 pajoye Exp $
+# $Id: Makefile,v 1.35.2.1.2.6.2.10 2008/11/21 14:18:27 pajoye Exp $
# This is the makefile template for the win32 build
CC="$(CL)"
@@ -22,6 +22,7 @@
MC="$(MC)"
MT="$(MT)"
RE2C="$(RE2C)"
+PHP_BUILD=$(PHP_BUILD)
MCFILE=$(BUILD_DIR)\wsyslog.rc
@@ -118,6 +119,7 @@
<<NOKEEP
build-snap: generated_files
+ SET PATH=$(PATH);$(PHP_BUILD)\bin
@$(MAKE) "$(BUILD_DIR)\$(PHPDLL)"
-for %T in ($(SAPI_TARGETS)) do $(MAKE) /I /nologo "%T"
-for %T in ($(EXT_TARGETS)) do $(MAKE) /I /nologo "%T"
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.10.2.34&r2=1.40.2.8.2.10.2.35&diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40.2.8.2.10.2.34
php-src/win32/build/config.w32:1.40.2.8.2.10.2.35
--- php-src/win32/build/config.w32:1.40.2.8.2.10.2.34 Mon Oct 20 14:47:33 2008
+++ php-src/win32/build/config.w32 Fri Nov 21 14:18:27 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.40.2.8.2.10.2.34 2008/10/20 14:47:33 pajoye Exp $
+// $Id: config.w32,v 1.40.2.8.2.10.2.35 2008/11/21 14:18:27 pajoye Exp $
// "Master" config file; think of it as a configure.in
// equivalent.
@@ -236,6 +236,7 @@
}
}
}
+DEFINE("PHP_BUILD", PHP_PHP_BUILD);
ARG_WITH('extra-includes', 'Extra include path to use when building
everything', '');
ARG_WITH('extra-libs', 'Extra library path to use when linking everything',
'');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
