cvs: php-src(PHP_5_2) /win32/build Makefile

From: Date: Sat, 13 Jan 2007 03:32:28 +0000
Subject: cvs: php-src(PHP_5_2) /win32/build Makefile
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-42709@lists.php.net to get a copy of this message
fmk Sat Jan 13 03:32:28 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/win32/build Makefile Log: MFH: Kill warnings when mt is not installed or is found as the tape command under cygwin http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.35.2.1.2.4&r2=1.35.2.1.2.5&diff_format=u Index: php-src/win32/build/Makefile diff -u php-src/win32/build/Makefile:1.35.2.1.2.4 php-src/win32/build/Makefile:1.35.2.1.2.5 --- php-src/win32/build/Makefile:1.35.2.1.2.4 Mon Jan 8 00:27:06 2007 +++ php-src/win32/build/Makefile Sat Jan 13 03:32:28 2007 @@ -14,7 +14,7 @@ # | Author: Wez Furlong <wez@thebrainroom.com> | # +----------------------------------------------------------------------+ # -# $Id: Makefile,v 1.35.2.1.2.4 2007/01/08 00:27:06 edink Exp $ +# $Id: Makefile,v 1.35.2.1.2.5 2007/01/13 03:32:28 fmk Exp $ # This is the makefile template for the win32 build CC="$(CL)" @@ -55,8 +55,13 @@ # $(RC) /fo $(MCFILE) $(BUILD_DIR)\wsyslog.rc +!if $(MT) == "" +_VC_MANIFEST_EMBED_EXE= +_VC_MANIFEST_EMBED_DLL= +!else _VC_MANIFEST_EMBED_EXE= $(MT) -nologo -manifest $@.manifest -outputresource:$@;1 _VC_MANIFEST_EMBED_DLL= $(MT) -nologo -manifest $@.manifest -outputresource:$@;2 +!endif $(PHPDLL_RES): win32\build\template.rc $(RC) /fo $(PHPDLL_RES) /d FILE_DESCRIPTION="\"PHP Script Interpreter\"" \

« previous php.cvs (#42709) next »