diff --git a/configure-x64-v140-runtime.bat b/configure-x64-v140-runtime.bat
deleted file mode 100644
index 87c0672..0000000
--- a/configure-x64-v140-runtime.bat
+++ /dev/null
@@ -1,20 +0,0 @@
-:: do not change the build target paths (causes stashed.io misses)
-:: the ninja generator has no options to specifiy targeting the vs2015/v140 runtime, so we use the vs-generator
-:: vs2019 community edition is required to build.
- 
-set SRC=%cd%
-call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\VsDevCmd.bat"
-
-mkdir x64
-mkdir x64\release
-pushd x64\release
-cmake -G "Visual Studio 16 2019" -A x64 -T v140 -DCMAKE_BUILD_TYPE=RelWithDebInfo %SRC%
-popd
-
-mkdir x64\debug
-pushd x64\debug
-cmake -G "Visual Studio 16 2019" -A x64 -T v140 -DCMAKE_BUILD_TYPE=Debug %SRC%
-popd
-
-pause
-
diff --git a/configure-x64-v141-runtime.bat b/configure-x64-v141-runtime.bat
index f62d92c..0866359 100644
--- a/configure-x64-v141-runtime.bat
+++ b/configure-x64-v141-runtime.bat
@@ -1,15 +1,20 @@
+
 :: do not change the build target paths (causes stashed.io misses)
-:: the ninja generator will use the default target platform of the 'Native Tools Command Prompt' it runs in.
+:: at least "Visual Studio 2017 Version 15.8" is required to build
+:: vs2019 community edition is required to build.
 
+set SRC=%cd%
 mkdir x64
-mkdir x64\release
-pushd x64\release
-cmake -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
+pushd x64
+:: remember -DCMAKE_BUILD_TYPE=RelWithDebInfo has no effect on "Visual Studio" multi-config generatators
+cmake -G "Visual Studio 15 2017" -A x64 -T v141,host=x64 %SRC%
 popd
 
-mkdir x64\debug
-pushd x64\debug
-cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug ..
-popd
+@echo off
+echo Compile using: (order of arguments is important!)
+echo cmake --build x64 --config Debug
+echo   or 
+echo cmake --build x64 --config RelWithDebInfo
 
+pause
 
diff --git a/configure-x64-v142-runtime.bat b/configure-x64-v142-runtime.bat
new file mode 100644
index 0000000..96c54ae
--- /dev/null
+++ b/configure-x64-v142-runtime.bat
@@ -0,0 +1,32 @@
+:: do not change the build target paths (causes stashed.io misses)
+:: the ninja generator will use the default target platform of the 'Native Tools Command Prompt' it runs in.
+
+set SRC=%cd%
+set COM_BUILD="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat"
+set PRO_BUILD="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat"
+set ENT_BUILD="C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat"
+
+if exist %COM_BUILD% (
+  call %COM_BUILD% x64
+) 
+
+if exist %PRO_BUILD% (
+  call %PRO_BUILD% x64
+) 
+
+if exist %ENT_BUILD% (
+  call %ENT_BUILD% x64
+) 
+
+mkdir x64
+mkdir x64\release
+pushd x64\release
+cmake -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe" -DMSVC_TOOLSET_VERSION=142 -DCMAKE_BUILD_TYPE=RelWithDebInfo -G Ninja %SRC%
+popd
+
+mkdir x64\debug
+pushd x64\debug
+cmake -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe" -DMSVC_TOOLSET_VERSION=142 -DCMAKE_BUILD_TYPE=Debug -G Ninja %SRC%
+popd
+
+