diff --git a/CPP/Build.mak b/CPP/Build.mak
index f2615788..07c87eee 100644
--- a/CPP/Build.mak
+++ b/CPP/Build.mak
@@ -1,4 +1,3 @@
-LIBS = $(LIBS) oleaut32.lib ole32.lib
 
 !IFNDEF MY_NO_UNICODE
 CFLAGS = $(CFLAGS) -DUNICODE -D_UNICODE
@@ -12,127 +11,51 @@ O=o
 !ENDIF
 !ENDIF
 
-# CFLAGS = $(CFLAGS) -FAsc -Fa$O/asm/
+LIBS = $(LIBS) oleaut32.lib ole32.lib user32.lib advapi32.lib shell32.lib
 
-
-!IF "$(PLATFORM)" == "x64"
-MY_ML = ml64 -Dx64 -WX
-!ELSEIF "$(PLATFORM)" == "arm"
-MY_ML = armasm -WX
-!ELSE
-MY_ML = ml -WX
-!ENDIF
-
-
-!IFDEF UNDER_CE
-RFLAGS = $(RFLAGS) -dUNDER_CE
-!IFDEF MY_CONSOLE
-LFLAGS = $(LFLAGS) /ENTRY:mainACRTStartup
-!ENDIF
-!ELSE
-!IFDEF OLD_COMPILER
-LFLAGS = $(LFLAGS) -OPT:NOWIN98
-!ENDIF
-!IF "$(PLATFORM)" != "arm" && "$(PLATFORM)" != "arm64"
-CFLAGS = $(CFLAGS) -Gr
-!ENDIF
-LIBS = $(LIBS) user32.lib advapi32.lib shell32.lib
-!ENDIF
-
-!IF "$(PLATFORM)" == "arm"
-COMPL_ASM = $(MY_ML) $** $O/$(*B).obj
-!ELSE
-COMPL_ASM = $(MY_ML) -c -Fo$O/ $**
-!ENDIF
-
-CFLAGS = $(CFLAGS) -nologo -c -Fo$O/ -W4 -WX -EHsc -Gy -GR- -GF -GL
-
-!IFDEF MY_DYNAMIC_LINK
-CFLAGS = $(CFLAGS) -MD
-!ELSE
-!IFNDEF MY_SINGLE_THREAD
-CFLAGS = $(CFLAGS) -MT
-!ENDIF
-!ENDIF
-
-!IFNDEF OLD_COMPILER
-CFLAGS = $(CFLAGS) -GS- -Zc:forScope -Zc:wchar_t
-!IFNDEF UNDER_CE
-CFLAGS = $(CFLAGS) -MP2
-!IFNDEF PLATFORM
-# CFLAGS = $(CFLAGS) -arch:IA32
-!ENDIF
-!ENDIF
-!ELSE
-CFLAGS = $(CFLAGS)
-!ENDIF
+CFLAGS = $(CFLAGS) -c /nologo /Fo$O/ /W4 /WX /EHsc /MT /MP /GL /Gw
 
 !IFDEF MY_CONSOLE
 CFLAGS = $(CFLAGS) -D_CONSOLE
 !ENDIF
 
-!IFNDEF UNDER_CE
-!IF "$(PLATFORM)" == "arm"
-CFLAGS = $(CFLAGS) -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE
-!ENDIF
-!ENDIF
+CFLAGS_O1 = $(CFLAGS) /O1
+CFLAGS_O2 = $(CFLAGS) /O2 /Ob3
 
-!IF "$(PLATFORM)" == "x64"
-CFLAGS_O1 = $(CFLAGS) -O1
-!ELSE
-CFLAGS_O1 = $(CFLAGS) -O1
-!ENDIF
-CFLAGS_O2 = $(CFLAGS) -O2
-
-LFLAGS = $(LFLAGS) -nologo -OPT:REF -OPT:ICF
-
-!IFNDEF UNDER_CE
-LFLAGS = $(LFLAGS) /LTCG /LARGEADDRESSAWARE
-!ENDIF
+LFLAGS = $(LFLAGS) /nologo /LTCG /LARGEADDRESSAWARE /OPT:REF,ICF,LBR
 
 !IFDEF DEF_FILE
-LFLAGS = $(LFLAGS) -DLL -DEF:$(DEF_FILE)
-!ELSE
-!IF defined(MY_FIXED) && "$(PLATFORM)" != "arm" && "$(PLATFORM)" != "arm64"
-LFLAGS = $(LFLAGS) /FIXED
-!ELSE
-LFLAGS = $(LFLAGS) /FIXED:NO
+LFLAGS = $(LFLAGS) /DLL /DEF:$(DEF_FILE)
 !ENDIF
-# /BASE:0x400000
-!ENDIF
-
-
-# !IF "$(PLATFORM)" == "x64"
-
-!IFDEF SUB_SYS_VER
-
-MY_SUB_SYS_VER=5.02
-
-!IFDEF MY_CONSOLE
-LFLAGS = $(LFLAGS) /SUBSYSTEM:console,$(MY_SUB_SYS_VER)
-!ELSE
-LFLAGS = $(LFLAGS) /SUBSYSTEM:windows,$(MY_SUB_SYS_VER)
-!ENDIF
-
-!ENDIF
-
 
 PROGPATH = $O\$(PROG)
 
-COMPL_O1   = $(CC) $(CFLAGS_O1) $**
-COMPL_O2   = $(CC) $(CFLAGS_O2) $**
-COMPL_PCH  = $(CC) $(CFLAGS_O1) -Yc"StdAfx.h" -Fp$O/a.pch $**
-COMPL      = $(CC) $(CFLAGS_O1) -Yu"StdAfx.h" -Fp$O/a.pch $**
+!IF "$(PLATFORM)" == "x64"
+MY_ML = ml64 /Dx64 /WX
+!ELSEIF "$(PLATFORM)" == "arm"
+MY_ML = armasm /WX
+!ELSE
+MY_ML = ml /WX
+!ENDIF
 
-COMPLB    = $(CC) $(CFLAGS_O1) -Yu"StdAfx.h" -Fp$O/a.pch $<
-# COMPLB_O2 = $(CC) $(CFLAGS_O2) -Yu"StdAfx.h" -Fp$O/a.pch $<
-COMPLB_O2 = $(CC) $(CFLAGS_O2) $<
+!IF "$(PLATFORM)" == "arm"
+COMPL_ASM = $(MY_ML) /nologo $** $O/$(*B).obj
+!ELSE
+COMPL_ASM = $(MY_ML) /nologo -c /Fo$O/ $**
+!ENDIF
+
+COMPL_O1     = $(CC) $(CFLAGS_O1) $**
+COMPL_O2     = $(CC) $(CFLAGS_O2) $**
+COMPL_PCH    = $(CC) $(CFLAGS_O1) /Yc"StdAfx.h" /Fp$O/a.pch $**
+COMPL        = $(CC) $(CFLAGS_O1) /Yu"StdAfx.h" /Fp$O/a.pch $**
+COMPLB       = $(CC) $(CFLAGS_O1) /Yu"StdAfx.h" /Fp$O/a.pch $<
+COMPLB_O2    = $(CC) $(CFLAGS_O2) $<
 
 CFLAGS_C_ALL = $(CFLAGS_O2) $(CFLAGS_C_SPEC)
-CCOMPL_PCH  = $(CC) $(CFLAGS_C_ALL) -Yc"Precomp.h" -Fp$O/a.pch $**
-CCOMPL_USE  = $(CC) $(CFLAGS_C_ALL) -Yu"Precomp.h" -Fp$O/a.pch $**
-CCOMPL      = $(CC) $(CFLAGS_C_ALL) $**
-CCOMPLB     = $(CC) $(CFLAGS_C_ALL) $<
+CCOMPL_PCH   = $(CC) $(CFLAGS_C_ALL) /Yc"Precomp.h" /Fp$O/a.pch $**
+CCOMPL_USE   = $(CC) $(CFLAGS_C_ALL) /Yu"Precomp.h" /Fp$O/a.pch $**
+CCOMPL       = $(CC) $(CFLAGS_C_ALL) $**
+CCOMPLB      = $(CC) $(CFLAGS_C_ALL) $<
 
 
 all: $(PROGPATH)
@@ -150,7 +73,7 @@ $(PROGPATH): $O $O/asm $(OBJS) $(DEF_FILE)
 
 !IFNDEF NO_DEFAULT_RES
 $O\resource.res: $(*B).rc
-	rc $(RFLAGS) -fo$@ $**
+	rc $(RFLAGS) /nologo /fo$@ $**
 !ENDIF
 $O\StdAfx.obj: $(*B).cpp
 	$(COMPL_PCH)
diff --git a/CPP/appveyor.cmd b/CPP/appveyor.cmd
index 842d3299..8136a3d2 100644
--- a/CPP/appveyor.cmd
+++ b/CPP/appveyor.cmd
@@ -18,7 +18,6 @@ goto build_vs2017
 set VC=15.0
 set PATH=%OPATH%
 set SUBSYS="5.01"
-set OPTS=MY_STATIC_LINK=1 /NOLOGO
 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86
 call build-it.cmd