strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS nowrapcmd2 (1.21.4); FILE MERGED

Browse source 
2008/02/29 23:38:26 vq 1.21.4.1: #i85207# Remove WRAPCMDs.
This commit is contained in:
Kurt Zenker 2008-03-05 15:35:42 +00:00
parent 43760f4842
commit 123d6e44d8
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
solenv/inc/wntmsci11.mk
View file

@ -4,9 +4,9 @@
#
# $RCSfile: wntmsci11.mk,v $
#
# $Revision: 1.21 $
# $Revision: 1.22 $
#
# last change: $Author: obo $ $Date: 2008-02-25 16:43:08 $
# last change: $Author: kz $ $Date: 2008-03-05 16:35:42 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -48,14 +48,14 @@ AFLAGS=/c /Cp /coff
# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
ARCH_FLAGS*=
CC*:=$(WRAPCMD) cl
CC*:=cl
.IF "$(bndchk)" != ""
CXX*=nmcl
.ELSE
.IF "$(truetime)" != ""
CXX*=nmcl /NMttOn
.ELSE
CXX*:=$(WRAPCMD) cl
CXX*:=cl
.ENDIF
.ENDIF # "$(bndchk)" != ""
@ -223,7 +223,7 @@ CDEFS+=-DWINVER=0x0500 -D_WIN32_IE=0x0500
_VC_MANIFEST_BASENAME=__VC90
.ENDIF
LINK=$(WRAPCMD) link $(NOLOGO) /MACHINE:IX86
LINK=link $(NOLOGO) /MACHINE:IX86
LINKOUTPUTFILTER= $(PIPEERROR) $(GREP) -v "LNK4197:"
.IF "$(PRODUCT)"!="full"
.ELSE
@ -316,8 +316,8 @@ MFC_INCLUDE*=$(COMPATH)$/atlmfc$/include
MFC_LIB*=$(COMPATH)$/atlmfc$/lib
.ENDIF
LIBMGR=$(WRAPCMD) lib $(NOLOGO)
IMPLIB=$(WRAPCMD) lib
LIBMGR=lib $(NOLOGO)
IMPLIB=lib
LIBFLAGS=
IMPLIBFLAGS=-machine:IX86
@ -325,7 +325,7 @@ IMPLIBFLAGS=-machine:IX86
MAPSYM=
MAPSYMFLAGS=
RC=$(WRAPCMD) rc
RC=rc
RCFLAGS=-r -DWIN32 -fo$@ $(RCFILES)
RCLINK=rc
RCLINKFLAGS=
@ -336,7 +336,7 @@ DLLPOSTFIX=mi
PCHPOST=.pch
CSC*=$(FLIPCMD) csc
VBC*=$(WRAPCMD) vbc
VBC*=vbc
ADVAPI32LIB=advapi32.lib
SHELL32LIB=shell32.lib