CWS-TOOLING: integrate CWS kick4nt

1 files changed, 50 insertions, 50 deletions

diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk
index 808b5b2aee18..35d9e483ded8 100644
--- a/solenv/inc/set_wntx64.mk
+++ b/solenv/inc/set_wntx64.mk
@@ -49,7 +49,7 @@ USE_CFLAGS_X64=-c -nologo -Gs $(NOLOGO) -Zm500 -Zc:forScope,wchar_t- -GR
 USE_CFLAGS_X64+=$(CFLAGS_X64)
 USE_CDEFS_X64+= -DWIN32 -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS
 USE_CDEFS_X64+=$(CDEFS_X64)
-INCLUDE_X64=$(subst,$/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
+INCLUDE_X64=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
 
 .IF "$(product)" != ""
 USE_CFLAGS_X64+=-Gy
@@ -97,58 +97,58 @@ STDSLOCUI_X64=
 
 IMPLIBFLAGS_X64=-machine:X64
 
-LIBPATH_X64=$(PSDK)$/lib$/x64
-LIBPATH_VC_X64=$(PSDK)$/vc$/lib$/x64
-
-ADVAPI32LIB_X64=$(LIBPATH_X64)$/advapi32.lib
-SHELL32LIB_X64=$(LIBPATH_X64)$/shell32.lib
-GDI32LIB_X64=$(LIBPATH_X64)$/gdi32.lib
-OLE32LIB_X64=$(LIBPATH_X64)$/ole32.lib
-OLEAUT32LIB_X64=$(LIBPATH_X64)$/oleaut32.lib
-UUIDLIB_X64=$(LIBPATH_X64)$/uuid.lib
-WINSPOOLLIB_X64=$(LIBPATH_X64)$/winspool.lib
-IMM32LIB_X64=$(LIBPATH_X64)$/imm32.lib
-VERSIONLIB_X64=$(LIBPATH_X64)$/version.lib
-WINMMLIB_X64=$(LIBPATH_X64)$/winmm.lib
-WSOCK32LIB_X64=$(LIBPATH_X64)$/wsock32.lib
-MPRLIB_X64=$(LIBPATH_X64)$/mpr.lib
-WS2_32LIB_X64=$(LIBPATH_X64)$/ws2_32.lib
-KERNEL32LIB_X64=$(LIBPATH_X64)$/kernel32.lib
-USER32LIB_X64=$(LIBPATH_X64)$/user32.lib
-COMDLG32LIB_X64=$(LIBPATH_X64)$/comdlg32.lib
-COMCTL32LIB_X64=$(LIBPATH_X64)$/comctl32.lib
-CRYPT32LIB_X64=$(LIBPATH_X64)$/crypt32.lib
-GDIPLUSLIB_X64=$(LIBPATH_X64)$/gdiplus.lib
-DBGHELPLIB_X64=$(LIBPATH_X64)$/dbghelp.lib
-MSILIB_X64=$(LIBPATH_X64)$/msi.lib
-DDRAWLIB_X64=$(LIBPATH_X64)$/ddraw.lib
-SHLWAPILIB_X64=$(LIBPATH_X64)$/shlwapi.lib
-URLMONLIB_X64=$(LIBPATH_X64)$/urlmon.lib
-UNICOWSLIB_X64=$(LIBPATH_X64)$/unicows.lib
-WININETLIB_X64=$(LIBPATH_X64)$/wininet.lib
-OLDNAMESLIB_X64=$(LIBPATH_VC_X64)$/oldnames.lib
-MSIMG32LIB_X64=$(LIBPATH_X64)$/msimg32.lib
-MSVCPRT_X64=$(LIBPATH_VC_X64)$/msvcprt.lib
-MSVCRT_X64=$(LIBPATH_VC_X64)$/msvcrt.lib
-
-MISC_X64=$(MISC)$/x64
-OBJ_X64=$(OBJ)$/x64
-SLO_X64=$(SLO)$/x64
-LB_X64=$(LB)$/x64
-SLB_X64=$(SLB)$/x64
+LIBPATH_X64=$(PSDK)/lib/x64
+LIBPATH_VC_X64=$(PSDK)/vc/lib/x64
+
+ADVAPI32LIB_X64=$(LIBPATH_X64)/advapi32.lib
+SHELL32LIB_X64=$(LIBPATH_X64)/shell32.lib
+GDI32LIB_X64=$(LIBPATH_X64)/gdi32.lib
+OLE32LIB_X64=$(LIBPATH_X64)/ole32.lib
+OLEAUT32LIB_X64=$(LIBPATH_X64)/oleaut32.lib
+UUIDLIB_X64=$(LIBPATH_X64)/uuid.lib
+WINSPOOLLIB_X64=$(LIBPATH_X64)/winspool.lib
+IMM32LIB_X64=$(LIBPATH_X64)/imm32.lib
+VERSIONLIB_X64=$(LIBPATH_X64)/version.lib
+WINMMLIB_X64=$(LIBPATH_X64)/winmm.lib
+WSOCK32LIB_X64=$(LIBPATH_X64)/wsock32.lib
+MPRLIB_X64=$(LIBPATH_X64)/mpr.lib
+WS2_32LIB_X64=$(LIBPATH_X64)/ws2_32.lib
+KERNEL32LIB_X64=$(LIBPATH_X64)/kernel32.lib
+USER32LIB_X64=$(LIBPATH_X64)/user32.lib
+COMDLG32LIB_X64=$(LIBPATH_X64)/comdlg32.lib
+COMCTL32LIB_X64=$(LIBPATH_X64)/comctl32.lib
+CRYPT32LIB_X64=$(LIBPATH_X64)/crypt32.lib
+GDIPLUSLIB_X64=$(LIBPATH_X64)/gdiplus.lib
+DBGHELPLIB_X64=$(LIBPATH_X64)/dbghelp.lib
+MSILIB_X64=$(LIBPATH_X64)/msi.lib
+DDRAWLIB_X64=$(LIBPATH_X64)/ddraw.lib
+SHLWAPILIB_X64=$(LIBPATH_X64)/shlwapi.lib
+URLMONLIB_X64=$(LIBPATH_X64)/urlmon.lib
+UNICOWSLIB_X64=$(LIBPATH_X64)/unicows.lib
+WININETLIB_X64=$(LIBPATH_X64)/wininet.lib
+OLDNAMESLIB_X64=$(LIBPATH_VC_X64)/oldnames.lib
+MSIMG32LIB_X64=$(LIBPATH_X64)/msimg32.lib
+MSVCPRT_X64=$(LIBPATH_VC_X64)/msvcprt.lib
+MSVCRT_X64=$(LIBPATH_VC_X64)/msvcrt.lib
+
+MISC_X64=$(MISC)/x64
+OBJ_X64=$(OBJ)/x64
+SLO_X64=$(SLO)/x64
+LB_X64=$(LB)/x64
+SLB_X64=$(SLB)/x64
 L_X64=$(SOLARLIBDIR_X64)
-VERSIONOBJ_X64=$(SLO_X64)$/_version.obj
-BIN_X64=$(BIN)$/x64
-RES_X64=$(RES)$/x64
-SOLARLIBDIR_X64=$(SOLARVERSION)$/$(INPATH)$/lib$(EXT_UPDMINOR)$/x64
+VERSIONOBJ_X64=$(SLO_X64)/_version.obj
+BIN_X64=$(BIN)/x64
+RES_X64=$(RES)/x64
+SOLARLIBDIR_X64=$(SOLARVERSION)/$(INPATH)/lib$(EXT_UPDMINOR)/x64
 LIB_X64:=$(LB_X64);$(SLB_X64);$(ILIB_X64)
 
 .IF "$(LIBTARGET)"==""
 .IF "$(OBJFILES_X64)$(IDLOBJFILES_X64)"!=""
-OBJTARGET_X64=$(LB_X64)$/$(TARGET).lib
+OBJTARGET_X64=$(LB_X64)/$(TARGET).lib
 .ENDIF # "$(OBJFILES_X64)$(IDLOBJFILES_X64)"!=""
 .IF "$(SLOFILES_X64)$(IDLSLOFILES_x64)"!=""
-SLOTARGET_X64=$(SLB_X64)$/$(TARGET).lib
+SLOTARGET_X64=$(SLB_X64)/$(TARGET).lib
 .ENDIF # "$(SLOFILES_X64)$(IDLSLOFILES_x64)"!=""
 .ENDIF # "$(LIBTARGET)"==""
 
@@ -165,10 +165,10 @@ NOLIBSLOTARGET_X64=$(SLOFILES_X64)
 .ENDIF
 
 .IF "$(SHL1TARGET_X64)"!=""
-SHL1TARGETN_X64=$(BIN_X64)$/$(DLLPRE)$(SHL1TARGET_X64)$(DLLPOST)
+SHL1TARGETN_X64=$(BIN_X64)/$(DLLPRE)$(SHL1TARGET_X64)$(DLLPOST)
 .ENDIF
 .IF "$(SHL2TARGET_X64)"!=""
-SHL2TARGETN_X64=$(BIN_X64)$/$(DLLPRE)$(SHL2TARGET_X64)$(DLLPOST)
+SHL2TARGETN_X64=$(BIN_X64)/$(DLLPRE)$(SHL2TARGET_X64)$(DLLPOST)
 .ENDIF
 .IF "$(LIB1TARGET_X64)" != ""
 LIB1TARGETN_X64=$(LIB1TARGET_X64)
@@ -177,10 +177,10 @@ LIB1TARGETN_X64=$(LIB1TARGET_X64)
 LIB2TARGETN_X64=$(LIB2TARGET_X64)
 .ENDIF
 .IF "$(DEF1NAME_X64)"!=""
-DEF1TARGETN_X64=$(MISC_X64)$/$(DEF1NAME_X64).def
+DEF1TARGETN_X64=$(MISC_X64)/$(DEF1NAME_X64).def
 .ENDIF
 .IF "$(DEF2NAME_X64)"!=""
-DEF2TARGETN_X64=$(MISC_X64)$/$(DEF2NAME_X64).def
+DEF2TARGETN_X64=$(MISC_X64)/$(DEF2NAME_X64).def
 .ENDIF
 .ENDIF # "$(BUILD_X64)"!=""