pajoye Fri Nov 21 14:05:05 2008 UTC Modified files: /php-src/win32/build Makefile config.w32 Log: - 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.51&r2=1.52&diff_format=u Index: php-src/win32/build/Makefile diff -u php-src/win32/build/Makefile:1.51 php-src/win32/build/Makefile:1.52 --- php-src/win32/build/Makefile:1.51 Sun Oct 26 00:15:56 2008 +++ php-src/win32/build/Makefile Fri Nov 21 14:05:04 2008 @@ -14,7 +14,7 @@ # | Author: Wez Furlong <[EMAIL PROTECTED]> | # +----------------------------------------------------------------------+ # -# $Id: Makefile,v 1.51 2008/10/26 00:15:56 pajoye Exp $ +# $Id: Makefile,v 1.52 2008/11/21 14:05:04 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.88&r2=1.89&diff_format=u Index: php-src/win32/build/config.w32 diff -u php-src/win32/build/config.w32:1.88 php-src/win32/build/config.w32:1.89 --- php-src/win32/build/config.w32:1.88 Fri Nov 7 13:11:35 2008 +++ php-src/win32/build/config.w32 Fri Nov 21 14:05:04 2008 @@ -1,5 +1,5 @@ // vim:ft=javascript -// $Id: config.w32,v 1.88 2008/11/07 13:11:35 pajoye Exp $ +// $Id: config.w32,v 1.89 2008/11/21 14:05:04 pajoye Exp $ // "Master" config file; think of it as a configure.in // equivalent. @@ -234,6 +234,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