--- mstools/samples/inc/ntwin32.mak	2018/08/09 18:20:01	1.1.1.1
+++ mstools/samples/inc/ntwin32.mak	2018/08/09 18:20:48	1.1.1.2
@@ -10,13 +10,13 @@
 
 
 CPUTYPE=1
-cdebug = -Zd -Zi -Od
-cvtomfdebug = -g
+cdebug = -Zi -Od
 
 cc = cl386
-cflags	= -c -As -G3d -MT -W3 -Di386=1 $(cdebug)
+cflags	= -c -G3d -W3 -Di386=1 $(cdebug)
+cvtobj = REM MIPS-only conversion:
+cvtdebug =
 
-cvtobj = cvtomf $(cvtomfdebug) 
 !ENDIF
 
 !IF "$(CPU)" == "MIPS"
@@ -25,7 +25,8 @@ cvtobj = cvtomf $(cvtomfdebug)
 CPUTYPE=2
 cc = cc
 cflags	= -c -std -G0 -O -o $(*B).obj -EL -DMIPS=1
-cvtobj = mip2coff $(*B).obj
+cvtobj = mip2coff
+cvtdebug =
 !ENDIF
 
 !IFNDEF CPUTYPE
@@ -36,10 +37,9 @@ cvtobj = mip2coff $(*B).obj
 #Universal declaration
 
 cvars = -DWIN32
-linkdebug = -debug:full
+linkdebug = -debug:full -debugtype:cv
 link = link $(linkdebug)
 
-
 # link flags - must be specified after $(link)
 #
 # conflags : creating a character based console application
@@ -55,11 +55,6 @@ guiflags =  -subsystem:windows -entry:Wi
 #
 # note : $(LIB) is set in environment variables
 
-conlibs = $(LIB)\base.lib $(LIB)\console.lib $(LIB)\ntdll.lib	 \
-	  $(LIB)\libcmt.lib
-
-guilibs = $(LIB)\gdi.lib $(LIB)\user.lib $(LIB)\userrtl.lib	 \
-	  $(LIB)\base.lib $(LIB)\ntdll.lib $(LIB)\libcmt.lib	 \
-	  $(LIB)\winmm.lib $(LIB)\commdlg.lib
-
+conlibs = $(LIB)\libcmt.lib $(LIB)\*.lib
 
+guilibs = $(LIB)\libcmt.lib $(LIB)\*.lib