separate flags and defs

1ead1f8d · Hans-Joachim Lankenau · 99037640 · 1ead1f8d · 1ead1f8d · 1ead1f8d
Kaydet (Commit) 1ead1f8d authored Mar 14, 2001 tarafından Hans-Joachim Lankenau
Hide whitespace changes
Inline Side-by-side

Showing with 49 additions and 47 deletions

rules.mk solenv/inc/rules.mk +23 -23

settings.mk solenv/inc/settings.mk +8 -6

wnt.mk solenv/inc/wnt.mk +18 -18

No files found.
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: rules.mk,v $
 #
-#   $Revision: 1.24 $
+#   $Revision: 1.25 $
 #
-#   last change: $Author: hjs $ $Date: 2001-03-09 18:55:46 $
+#   last change: $Author: hjs $ $Date: 2001-03-14 17:50:31 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -321,7 +321,7 @@ $(MISC)$/s_%.dpcc : %.c
    @echo ------------------------------ $(noout)
    @echo Making: $@ $(noout)
    @+-$(RM) $@ >& $(NULLDEV)
-    @makedepend -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CFLAGSCC:s/-f/-x/) $(PCHSLOFLAGSU:s/-f/-x/) $(CFLAGSSLO:s/-f/-x/) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< > $@
+    @makedepend -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< > $@
 .IF "$(LAZY_DEPS)"==""	
    @+echo $@ : $(SLO)$/$(<:b).obj >> $@
 .ELSE			# "$(LAZY_DEPS)"==""	
@@ -332,7 +332,7 @@ $(MISC)$/o_%.dpcc : %.c
    @echo ------------------------------ $(noout)
    @echo Making: $@ $(noout)
    @+-$(RM) $@ >& $(NULLDEV)
-    @makedepend -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CFLAGSCC:s/-f/-x/) $(PCHOBJFLAGSU:s/-f/-x/) $(CFLAGSOBJ:s/-f/-x/) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< > $@
+    @makedepend -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< > $@
 .IF "$(LAZY_DEPS)"==""	
    @+echo $@ : $(OBJ)$/$(<:b).obj >> $@
 .ELSE			# "$(LAZY_DEPS)"==""	
@@ -343,7 +343,7 @@ $(MISC)$/s_%.dpcc : %.cxx
    @echo ------------------------------ $(noout)
    @echo Making: $@ $(noout)
    @+-$(RM) $@ >& $(NULLDEV)
-    @makedepend -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CFLAGSCC:s/-f/-x/) $(PCHSLOFLAGSU:s/-f/-x/) $(CFLAGSSLO:s/-f/-x/) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< > $@
+    @makedepend -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< > $@
 .IF "$(LAZY_DEPS)"==""	
    @+echo $@ : $(SLO)$/$(<:b).obj >> $@
 .ELSE			# "$(LAZY_DEPS)"==""	
@@ -354,7 +354,7 @@ $(MISC)$/o_%.dpcc : %.cxx
    @echo ------------------------------ $(noout)
    @echo Making: $@ $(noout)
    @+-$(RM) $@ >& $(NULLDEV)
-    @makedepend -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CFLAGSCC:s/-f/-x/) $(PCHOBJFLAGSU:s/-f/-x/) $(CFLAGSOBJ:s/-f/-x/) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< > $@
+    @makedepend -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< > $@
 .IF "$(LAZY_DEPS)"==""	
    @+echo $@ : $(OBJ)$/$(<:b).obj >> $@
 .ELSE			# "$(LAZY_DEPS)"==""	
@@ -365,7 +365,7 @@ $(MISC)$/s_%.dpcc : %.cpp
    @echo ------------------------------ $(noout)
    @echo Making: $@ $(noout)
    @+-$(RM) $@ >& $(NULLDEV)
-    @makedepend -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CFLAGSCC:s/-f/-x/) $(PCHSLOFLAGSU:s/-f/-x/) $(CFLAGSSLO:s/-f/-x/) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< > $@
+    @makedepend -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< > $@
 .IF "$(LAZY_DEPS)"==""	
    @+echo $@ : $(SLO)$/$(<:b).obj >> $@
 .ELSE			# "$(LAZY_DEPS)"==""	
@@ -376,7 +376,7 @@ $(MISC)$/o_%.dpcc : %.cpp
    @echo ------------------------------ $(noout)
    @echo Making: $@ $(noout)
    @+-$(RM) $@ >& $(NULLDEV)
-    @makedepend -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CFLAGSCC:s/-f/-x/) $(PCHOBJFLAGSU:s/-f/-x/) $(CFLAGSOBJ:s/-f/-x/) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< > $@
+    @makedepend -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< > $@
 .IF "$(LAZY_DEPS)"==""	
    @+echo $@ : $(OBJ)$/$(<:b).obj >> $@
 .ELSE			# "$(LAZY_DEPS)"==""	
@@ -388,9 +388,9 @@ $(MISC)$/s_%.dpcc : $(MISCX)$/%.c
    @echo Making: $@ $(noout)
    @+-$(RM) $@ >& $(NULLDEV)
 .IF "$(GUI)"=="UNX"	
-    @makedepend -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CFLAGSCC:s/-f/-x/) $(PCHSLOFLAGSU:s/-f/-x/) $(CFLAGSSLO:s/-f/-x/) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | sed s\#$(MISC)$/\#\# > $@
+    @makedepend -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | sed s\#$(MISC)$/\#\# > $@
 .ELSE			# "$(GUI)"=="UNX"	
-    @makedepend -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CFLAGSCC:s/-f/-x/) $(PCHSLOFLAGSU:s/-f/-x/) $(CFLAGSSLO:s/-f/-x/) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
+    @makedepend -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
 .ENDIF			# "$(GUI)"=="UNX"	
 .IF "$(LAZY_DEPS)"==""	
    @+echo $@ : $(SLO)$/$(<:b).obj >> $@
@@ -403,9 +403,9 @@ $(MISC)$/o_%.dpcc : $(MISCX)$/%.c
    @echo Making: $@ $(noout)
    @+-$(RM) $@ >& $(NULLDEV)
 .IF "$(GUI)"=="UNX"	
-    @makedepend -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CFLAGSCC:s/-f/-x/) $(PCHOBJFLAGSU:s/-f/-x/) $(CFLAGSOBJ:s/-f/-x/) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | sed s\#$(MISC)$/\#\# > $@
+    @makedepend -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | sed s\#$(MISC)$/\#\# > $@
 .ELSE			# "$(GUI)"=="UNX"	
-    @makedepend -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CFLAGSCC:s/-f/-x/) $(PCHOBJFLAGSU:s/-f/-x/) $(CFLAGSOBJ:s/-f/-x/) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
+    @makedepend -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
 .ENDIF			# "$(GUI)"=="UNX"	
 .IF "$(LAZY_DEPS)"==""	
    @+echo $@ : $(OBJ)$/$(<:b).obj >> $@
@@ -418,9 +418,9 @@ $(MISC)$/s_%.dpcc : $(MISCX)$/%.cxx
    @echo Making: $@ $(noout)
    @+-$(RM) $@ >& $(NULLDEV)
 .IF "$(GUI)"=="UNX"	
-    @makedepend -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CFLAGSCC:s/-f/-x/) $(PCHSLOFLAGSU:s/-f/-x/) $(CFLAGSSLO:s/-f/-x/) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | sed s\#$(MISC)$/\#\# > $@
+    @makedepend -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | sed s\#$(MISC)$/\#\# > $@
 .ELSE			# "$(GUI)"=="UNX"	
-    @makedepend -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CFLAGSCC:s/-f/-x/) $(PCHSLOFLAGSU:s/-f/-x/) $(CFLAGSSLO:s/-f/-x/) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
+    @makedepend -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
 .ENDIF			# "$(GUI)"=="UNX"	
 .IF "$(LAZY_DEPS)"==""	
    @+echo $@ : $(SLO)$/$(<:b).obj >> $@
@@ -433,9 +433,9 @@ $(MISC)$/o_%.dpcc : $(MISCX)$/%.cxx
    @echo Making: $@ $(noout)
    @+-$(RM) $@ >& $(NULLDEV)
 .IF "$(GUI)"=="UNX"	
-    @makedepend -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CFLAGSCC:s/-f/-x/) $(PCHOBJFLAGSU:s/-f/-x/) $(CFLAGSOBJ:s/-f/-x/) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | sed s\#$(MISC)$/\#\# > $@
+    @makedepend -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | sed s\#$(MISC)$/\#\# > $@
 .ELSE			# "$(GUI)"=="UNX"	
-    @makedepend -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CFLAGSCC:s/-f/-x/) $(PCHOBJFLAGSU:s/-f/-x/) $(CFLAGSOBJ:s/-f/-x/) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
+    @makedepend -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
 .ENDIF			# "$(GUI)"=="UNX"	
 .IF "$(LAZY_DEPS)"==""	
    @+echo $@ : $(OBJ)$/$(<:b).obj >> $@
@@ -449,7 +449,7 @@ $(MISC)$/s_%.dpcc : %.m
    @echo ------------------------------ $(noout)
    @echo Making: $@ $(noout)
    @+-$(RM) $@ >& $(NULLDEV)
-    @makedepend -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CFLAGSCC:s/-f/-x/) $(PCHSLOFLAGSU:s/-f/-x/) $(CFLAGSSLO:s/-f/-x/) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< > $@
+    @makedepend -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< > $@
 .IF "$(LAZY_DEPS)"==""	
    @+echo $@ : $(SLO)$/$(<:b).obj >> $@
 .ELSE			# "$(LAZY_DEPS)"==""	
@@ -460,7 +460,7 @@ $(MISC)$/o_%.dpcc : %.m
    @echo ------------------------------ $(noout)
    @echo Making: $@ $(noout)
    @+-$(RM) $@ >& $(NULLDEV)
-    @makedepend -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CFLAGSCC:s/-f/-x/) $(PCHOBJFLAGSU:s/-f/-x/) $(CFLAGSOBJ:s/-f/-x/) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< > $@
+    @makedepend -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< > $@
 .IF "$(LAZY_DEPS)"==""	
    @+echo $@ : $(OBJ)$/$(<:b).obj >> $@
 .ELSE			# "$(LAZY_DEPS)"==""	
@@ -472,9 +472,9 @@ $(MISC)$/s_%.dpcc : $(MISCX)$/%.m
    @echo Making: $@ $(noout)
    @+-$(RM) $@ >& $(NULLDEV)
 .IF "$(GUI)"=="UNX"	
-    @makedepend -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CFLAGSCC:s/-f/-x/) $(PCHSLOFLAGSU:s/-f/-x/) $(CFLAGSSLO:s/-f/-x/) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | sed s\#$(MISC)$/\#\# > $@
+    @makedepend -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | sed s\#$(MISC)$/\#\# > $@
 .ELSE			# "$(GUI)"=="UNX"	
-    @makedepend -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CFLAGSCC:s/-f/-x/) $(PCHSLOFLAGSU:s/-f/-x/) $(CFLAGSSLO:s/-f/-x/) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
+    @makedepend -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
 .ENDIF			# "$(GUI)"=="UNX"	
 .IF "$(LAZY_DEPS)"==""	
    @+echo $@ : $(SLO)$/$(<:b).obj >> $@
@@ -487,9 +487,9 @@ $(MISC)$/o_%.dpcc : $(MISCX)$/%.m
    @echo Making: $@ $(noout)
    @+-$(RM) $@ >& $(NULLDEV)
 .IF "$(GUI)"=="UNX"	
-    @makedepend -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CFLAGSCC:s/-f/-x/) $(PCHOBJFLAGSU:s/-f/-x/) $(CFLAGSOBJ:s/-f/-x/) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | sed s\#$(MISC)$/\#\# > $@
+    @makedepend -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | sed s\#$(MISC)$/\#\# > $@
 .ELSE			# "$(GUI)"=="UNX"	
-    @makedepend -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CFLAGSCC:s/-f/-x/) $(PCHOBJFLAGSU:s/-f/-x/) $(CFLAGSOBJ:s/-f/-x/) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
+    @makedepend -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
 .ENDIF			# "$(GUI)"=="UNX"	
 .IF "$(LAZY_DEPS)"==""	
    @+echo $@ : $(OBJ)$/$(<:b).obj >> $@
@@ -503,7 +503,7 @@ $(MISC)$/s_%.dpcc : %.s
    @echo ------------------------------ $(noout)
    @echo Making: $@ $(noout)
    @+-$(RM) $@ >& $(NULLDEV)
-    @makedepend -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CFLAGSCC:s/-f/-x/) $(PCHSLOFLAGSU:s/-f/-x/) $(CFLAGSSLO:s/-f/-x/) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< > $@
+    @makedepend -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< > $@
 .IF "$(LAZY_DEPS)"==""	
    @+echo $@ : $(SLO)$/$(<:b).obj >> $@
 .ELSE			# "$(LAZY_DEPS)"==""	

--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: settings.mk,v $
 #
-#   $Revision: 1.29 $
+#   $Revision: 1.30 $
 #
-#   last change: $Author: mh $ $Date: 2001-03-12 16:43:35 $
+#   last change: $Author: hjs $ $Date: 2001-03-14 17:50:31 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -1371,6 +1371,7 @@ PCHOBJFLAGSU=-Yu -Yd -Fp$(PROJECTPCHTARGET)
 .IF "$(TARGETTYPE)"=="GUI"
 CDEFS+= $(CDEFSGUI)
 CFLAGSSLO+=$(CFLAGSSLOGUIMT)
+CDEFSSLO+=$(CDEFSSLOMT)
 LINKFLAGSAPP=$(LINKFLAGSAPPGUI)
 LINKFLAGSSHL=$(LINKFLAGSSHLGUI)
 STDOBJ=$(STDOBJGUI)
@@ -1378,11 +1379,11 @@ STDSLO=$(STDSLOGUI)
 STDSHL=$(STDSHLGUIMT)

 .IF "$(TARGETTHREAD)"=="MT"
-CDEFSOBJ+= $(CDEFSMT)
+CDEFSOBJ+= $(CDEFSMT) $(CDEFSOBJMT)
 CFLAGSOBJ+=$(CFLAGSOBJGUIMT)
 STDLIB=$(STDLIBGUIMT)
 .ELSE
-CDEFSOBJ+= $(CDEFSST)
+CDEFSOBJ+= $(CDEFSST) $(CDEFSOBJST)
 CFLAGSOBJ+=$(CFLAGSOBJGUIST)
 STDLIB=$(STDLIBGUIST)
 .ENDIF
@@ -1393,6 +1394,7 @@ STDLIB=$(STDLIBGUIST)
 .IF "$(TARGETTYPE)" == "CUI" || "$(TARGETTYPE)"=="cui"
 CDEFS+= $(CDEFSCUI)
 CFLAGSSLO+=$(CFLAGSSLOCUIMT)
+CDEFSSLO+=$(CDEFSSLOMT)
 LINKFLAGSAPP=$(LINKFLAGSAPPCUI)
 LINKFLAGSSHL=$(LINKFLAGSSHLCUI)
 STDOBJ=$(STDOBJCUI)
@@ -1400,11 +1402,11 @@ STDSLO=$(STDSLOCUI)
 STDSHL=$(STDSHLCUIMT)

 .IF "$(TARGETTHREAD)" == "MT" || "$(TARGETTHREAD)"=="mt"
-CDEFSOBJ+=$(CDEFSMT)
+CDEFSOBJ+=$(CDEFSMT) $(CDEFSOBJMT)
 CFLAGSOBJ+=$(CFLAGSOBJCUIMT)
 STDLIB=$(STDLIBCUIMT)
 .ELSE
-CDEFSOBJ+= $(CDEFSST)
+CDEFSOBJ+=$(CDEFSST) $(CDEFSOBJST)
 CFLAGSOBJ+=$(CFLAGSOBJCUIST)
 STDLIB=$(STDLIBCUIST)
 .ENDIF

--- a/solenv/inc/wnt.mk
+++ b/solenv/inc/wnt.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: wnt.mk,v $
 #
-#   $Revision: 1.9 $
+#   $Revision: 1.10 $
 #
-#   last change: $Author: hjs $ $Date: 2001-02-02 14:16:40 $
+#   last change: $Author: hjs $ $Date: 2001-03-14 17:50:31 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -332,26 +332,26 @@ CFLAGSCALL=-Gz

 CFLAGSCC=
 .IF "$(DYNAMIC_CRT)"!=""
-CFLAGSSLOGUIMT=-DWIN32 -D_MT -D_DLL
-CFLAGSSLOCUIMT=-DWIN32 -D_MT -D_DLL
+CDEFSSLOMT+=-DWIN32 -D_MT -D_DLL
+CDEFSSLOMT+=-DWIN32 -D_MT -D_DLL
 .IF "$(NO_DYNAMIC_OBJ)"==""
-CFLAGSOBJGUIST=-DWIN32 -D_DLL
-CFLAGSOBJCUIST=-DWIN32 -D_DLL
-CFLAGSOBJGUIMT=-DWIN32 -D_MT -D_DLL
-CFLAGSOBJCUIMT=-DWIN32 -D_MT -D_DLL
+CDEFSOBJST+=-DWIN32 -D_DLL
+CDEFSOBJST+=-DWIN32 -D_DLL
+CDEFSOBJMT+=-DWIN32 -D_MT -D_DLL
+CDEFSOBJMT+=-DWIN32 -D_MT -D_DLL
 .ELSE
-CFLAGSOBJGUIST=-DWIN32
-CFLAGSOBJCUIST=-DWIN32
-CFLAGSOBJGUIMT=-DWIN32 -D_MT
-CFLAGSOBJCUIMT=-DWIN32 -D_MT
+CDEFSOBJST+=-DWIN32
+CDEFSOBJST+=-DWIN32
+CDEFSOBJMT+=-DWIN32 -D_MT
+CDEFSOBJMT+=-DWIN32 -D_MT
 .ENDIF
 .ELSE
-CFLAGSSLOGUIMT=-DWIN32 -D_MT 
-CFLAGSSLOCUIMT=-DWIN32 -D_MT 
-CFLAGSOBJGUIST=-DWIN32
-CFLAGSOBJCUIST=-DWIN32
-CFLAGSOBJGUIMT=-DWIN32 -D_MT
-CFLAGSOBJCUIMT=-DWIN32 -D_MT
+CDEFSSLOMT+=-DWIN32 -D_MT 
+CDEFSSLOMT+=-DWIN32 -D_MT 
+CDEFSOBJST+=-DWIN32
+CDEFSOBJST+=-DWIN32
+CDEFSOBJMT+=-DWIN32 -D_MT
+CDEFSOBJMT+=-DWIN32 -D_MT
 .ENDIF
 CFLAGSPROF=-Gh -Zd -Fd$(MISC)\$(TARGET).PDB
 .IF "$(PDBTARGET)"!=""