diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-08-23 08:19:06 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-08-23 08:19:06 +0000 |
| commit | 0c68ca11b548e77c12235f9d524d3fd05491df6b (patch) | |
| tree | 0cbbbc05a884db7c0bc43f795d3ba7d27f14faa6 /solenv/inc/wnt.mk | |
| parent | 1f5fc9af9d877d6a7edd05167eb173d60f564892 (diff) | |
INTEGRATION: CWS tune03 (1.63.12); FILE MERGED
2004/08/09 22:35:45 mhu 1.63.12.3: RESYNC: (1.63-1.64); FILE MERGED
2004/07/21 18:13:53 mhu 1.63.12.2: #i29979# Disabled dll-interface warnings: 4251 and 4275; Changed -Ox to -Oxs (full optimization, favoring smaller code size).
2004/07/21 12:45:43 hjs 1.63.12.1: #i29979# filter windows linker warning LNK4197
Diffstat (limited to 'solenv/inc/wnt.mk')
| -rw-r--r-- | solenv/inc/wnt.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk index 7d54e0198a54..4e74388aece1 100644 --- a/solenv/inc/wnt.mk +++ b/solenv/inc/wnt.mk @@ -2,9 +2,9 @@ # # $RCSfile: wnt.mk,v $ # -# $Revision: 1.64 $ +# $Revision: 1.65 $ # -# last change: $Author: rt $ $Date: 2004-07-12 12:59:41 $ +# last change: $Author: rt $ $Date: 2004-08-23 09:19:06 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -165,7 +165,7 @@ CFLAGS+=-Zm200 #.IF"$(bndchk)"=="" .IF "$(COMEX)"=="8" || "$(COMEX)"=="10" -CFLAGS+=-Zm500 -wd4290 -wd4786 -wd4800 /Zc:forScope /GR +CFLAGS+=-Zm500 -wd4251 -wd4275 -wd4290 -wd4786 -wd4800 /Zc:forScope /GR .ENDIF #.ENDIF @@ -247,7 +247,7 @@ CFLAGSDEBUG=-Zi -Fd$(MISC)\_ooo_st_$(TARGET).PDB .ENDIF CFLAGSDBGUTIL= .IF "$(VC_STANDARD)"=="" -CFLAGSOPT=-Ox -Oy- +CFLAGSOPT=-Oxs -Oy- CFLAGSNOOPT=-Od .ELSE # "$(VC_STANDARD)"=="" CFLAGSOPT= @@ -300,7 +300,7 @@ LINK=link $(COMMENTFLAG) $(NOLOGO) /MACHINE:IX86 .ELSE # "$(USE_SHELL)"=="4nt" LINK=$(WRAPCMD) link $(NOLOGO) /MACHINE:IX86 .ENDIF # "$(USE_SHELL)"=="4nt" - +LINKOUTPUTFILTER= |& $(GREP) -v "LNK4197:" .IF "$(PRODUCT)"!="full" .ELSE LINKFLAGS=/MAP /OPT:NOREF |