From 3cc872a33bb39027bff1555c10d795f532f8fb2f Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Wed, 5 Jul 2006 21:06:01 +0000 Subject: [PATCH] INTEGRATION: CWS ause058 (1.5.156); FILE MERGED 2006/06/26 12:28:16 hjs 1.5.156.3: RESYNC: (1.5-1.6); FILE MERGED 2006/06/23 21:07:47 vq 1.5.156.2: #i66669# Replace |& with $(PIPEERROR). 2006/06/13 16:21:24 hjs 1.5.156.1: #i55987# seperate INCLUDE from CFLAGS; introduce INCLUDE_C for include path without stlport --- solenv/inc/wntmsci10.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/solenv/inc/wntmsci10.mk b/solenv/inc/wntmsci10.mk index cf7a398ebb00..fd71606be451 100644 --- a/solenv/inc/wntmsci10.mk +++ b/solenv/inc/wntmsci10.mk @@ -4,9 +4,9 @@ # # $RCSfile: wntmsci10.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: hr $ $Date: 2006-06-19 17:18:03 $ +# last change: $Author: kz $ $Date: 2006-07-05 22:06:01 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -77,7 +77,7 @@ CXX+= /NMttNoLines # Flags for COMEX == 10 CFLAGS+=-Zm500 -Zc:forScope -GR -CFLAGS+=-c -nologo -Gs $(NOLOGO) $(MINUS_I)$(INCLUDE) +CFLAGS+=-c -nologo -Gs $(NOLOGO) CDEFS+= -D_X86_=1 @@ -267,7 +267,7 @@ CDEFS+=-D_MT COMMENTFLAG=/COMMENT:"$(PRJNAME)_$(UPD)_$(VCSID)_" LINK=$(WRAPCMD) link $(COMMENTFLAG) $(NOLOGO) /MACHINE:IX86 -LINKOUTPUTFILTER= |& $(GREP) -v "LNK4197:" +LINKOUTPUTFILTER= $(PIPEERROR) $(GREP) -v "LNK4197:" .IF "$(PRODUCT)"!="full" .ELSE LINKFLAGS=/MAP /OPT:NOREF