diff --git a/mps/src/commpre.nmk b/mps/src/commpre.nmk index 3a031f6f66c..4332953eaf7 100644 --- a/mps/src/commpre.nmk +++ b/mps/src/commpre.nmk @@ -1,6 +1,6 @@ # ==== FIRST COMMON FRAGMENT FOR PLATFORMS USING MV AND NMAKE # -# $HopeName: MMsrc!commpre.nmk(trunk.13) $ +# $HopeName: MMsrc!commpre.nmk(trunk.14) $ # Copyright (C) 1995, 1997, 1998 Harlequin Group, all rights reserved # # DESCRIPTION @@ -120,12 +120,13 @@ CFLAGSEXTERNAL = # The combinations of variety # @@@@ TI is a temporary telemetry variety +CFWE = /DCONFIG_VAR_WE $(CFLAGSHOT) $(CFLAGSEXTERNAL) +CFWI = /DCONFIG_VAR_WI $(CFLAGSHOT) $(CFLAGSINTERNAL) CFHE = /DCONFIG_VAR_HE $(CFLAGSHOT) $(CFLAGSEXTERNAL) -CFCE = /DCONFIG_VAR_CE $(CFLAGSCOOL) $(CFLAGSEXTERNAL) CFHI = /DCONFIG_VAR_HI $(CFLAGSHOT) $(CFLAGSINTERNAL) +CFCE = /DCONFIG_VAR_CE $(CFLAGSCOOL) $(CFLAGSEXTERNAL) CFCI = /DCONFIG_VAR_CI $(CFLAGSCOOL) $(CFLAGSINTERNAL) CFTI = /DCONFIG_VAR_TI $(CFLAGSCOOL) $(CFLAGSINTERNAL) -CFWI = /DCONFIG_VAR_WI $(CFLAGSHOT) $(CFLAGSINTERNAL) # Microsoft documentation is not very clear on the point of using both # optimization and debug information @@ -139,12 +140,13 @@ LINKFLAGSEXTERNAL = /RELEASE LINKFLAGSHOT = LINKFLAGSCOOL = +LFWE = $(LINKFLAGSHOT) $(LINKFLAGSEXTERNAL) +LFWI = $(LINKFLAGSHOT) $(LINKFLAGSINTERNAL) LFHE = $(LINKFLAGSHOT) $(LINKFLAGSEXTERNAL) -LFCE = $(LINKFLAGSCOOL) $(LINKFLAGSEXTERNAL) LFHI = $(LINKFLAGSHOT) $(LINKFLAGSINTERNAL) +LFCE = $(LINKFLAGSCOOL) $(LINKFLAGSEXTERNAL) LFCI = $(LINKFLAGSCOOL) $(LINKFLAGSINTERNAL) LFTI = $(LINKFLAGSCOOL) $(LINKFLAGSINTERNAL) -LFWI = $(LINKFLAGSHOT) $(LINKFLAGSINTERNAL) #LFCV = /PROFILE /DEBUG:full /DEBUGTYPE:cv @@ -152,12 +154,13 @@ LFWI = $(LINKFLAGSHOT) $(LINKFLAGSINTERNAL) # %%VARIETY: define a macro containing the flags for the new variety LIBMAN = lib # can't call this LIB - it screws the environment LIBFLAGSCOMMON = /nologo +LIBFLAGSWE = +LIBFLAGSWI = LIBFLAGSHE = -LIBFLAGSCE = LIBFLAGSHI = +LIBFLAGSCE = LIBFLAGSCI = LIBFLAGSTI = -LIBFLAGSWI = #LIBFLAGSCV = # Browser database manager [not used at present]