4 files changed, 40 insertions, 8 deletions
diff --git a/msvc-14/msvc-14u2-32 b/msvc-14/msvc-14u2-32
index 0d54bb7..0eadc14 100755
--- a/msvc-14/msvc-14u2-32
+++ b/msvc-14/msvc-14u2-32
@@ -8,11 +8,16 @@ if [ -z "$MSVC_INSTALLDIR" ]; then
   MSVC_INSTALLDIR="Microsoft Visual Studio 14.0"
 fi
 
+if [ -z "$MSVC_SDKVERSION" ]; then
+  source "$src_dir/msvc-common/msvc-sdk-common"
+  MSVC_SDKVERSION="$(windows10_sdkversion)"
+fi
+
 # SDK
 #
 SDK="C:\\Program Files (x86)\\Windows Kits\\10"
 SDKBIN="$SDK\\bin\\x86"
-SDKVER="10.0.10586.0"
+SDKVER="$MSVC_SDKVERSION.0" # Originally "10.0.10586".
 
 INCLUDE="$SDK\\include\\$SDKVER\\shared;$SDK\\include\\$SDKVER\\um;$SDK\\include\\$SDKVER\\winrt"
 LIB="$SDK\\lib\\$SDKVER\\um\\x86"
@@ -20,7 +25,7 @@ LIB="$SDK\\lib\\$SDKVER\\um\\x86"
 # CRT
 #
 CRT="C:\\Program Files (x86)\\Windows Kits\\10"
-CRTVER="10.0.10586.0"
+CRTVER="$MSVC_SDKVERSION.0" # Originally "10.0.10586".
 
 INCLUDE="$CRT\\include\\$CRTVER\\ucrt;$INCLUDE"
 LIB="$CRT\\lib\\$CRTVER\\ucrt\\x86;$LIB"
diff --git a/msvc-14/msvc-14u2-64 b/msvc-14/msvc-14u2-64
index 5ac895b..78d65d8 100755
--- a/msvc-14/msvc-14u2-64
+++ b/msvc-14/msvc-14u2-64
@@ -8,11 +8,16 @@ if [ -z "$MSVC_INSTALLDIR" ]; then
   MSVC_INSTALLDIR="Microsoft Visual Studio 14.0"
 fi
 
+if [ -z "$MSVC_SDKVERSION" ]; then
+  source "$src_dir/msvc-common/msvc-sdk-common"
+  MSVC_SDKVERSION="$(windows10_sdkversion)"
+fi
+
 # SDK
 #
 SDK="C:\\Program Files (x86)\\Windows Kits\\10"
 SDKBIN="$SDK\\bin\\x64"
-SDKVER="10.0.10586.0"
+SDKVER="$MSVC_SDKVERSION.0" # Originally "10.0.10586".
 
 INCLUDE="$SDK\\include\\$SDKVER\\shared;$SDK\\include\\$SDKVER\\um;$SDK\\include\\$SDKVER\\winrt"
 LIB="$SDK\\lib\\$SDKVER\\um\\x64"
@@ -20,7 +25,7 @@ LIB="$SDK\\lib\\$SDKVER\\um\\x64"
 # CRT
 #
 CRT="C:\\Program Files (x86)\\Windows Kits\\10"
-CRTVER="10.0.10586.0"
+CRTVER="$MSVC_SDKVERSION.0" # Originally "10.0.10586".
 
 INCLUDE="$CRT\\include\\$CRTVER\\ucrt;$INCLUDE"
 LIB="$CRT\\lib\\$CRTVER\\ucrt\\x64;$LIB"
diff --git a/msvc-14/msvc-14u3-32 b/msvc-14/msvc-14u3-32
index 6d9f277..4822400 100755
--- a/msvc-14/msvc-14u3-32
+++ b/msvc-14/msvc-14u3-32
@@ -8,11 +8,19 @@ if [ -z "$MSVC_INSTALLDIR" ]; then
   MSVC_INSTALLDIR="Microsoft Visual Studio 14.0"
 fi
 
+if [ -z "$MSVC_SDKVERSION" ]; then
+  source "$src_dir/msvc-common/msvc-sdk-common"
+  MSVC_SDKVERSION="$(windows10_sdkversion)"
+fi
+
 # SDK
 #
 SDK="C:\\Program Files (x86)\\Windows Kits\\10"
 SDKBIN="$SDK\\bin\\x86"
-SDKVER="10.0.14393.0"
+
+# Originally "10.0.14393" (if upgrade 14u2) or "10.0.10240" (if clean install).
+#
+SDKVER="$MSVC_SDKVERSION.0"
 
 INCLUDE="$SDK\\include\\$SDKVER\\shared;$SDK\\include\\$SDKVER\\um;$SDK\\include\\$SDKVER\\winrt"
 LIB="$SDK\\lib\\$SDKVER\\um\\x86"
@@ -20,7 +28,10 @@ LIB="$SDK\\lib\\$SDKVER\\um\\x86"
 # CRT
 #
 CRT="C:\\Program Files (x86)\\Windows Kits\\10"
-CRTVER="10.0.14393.0"
+
+# Originally "10.0.14393" (if upgrade 14u2) or "10.0.10240" (if clean install).
+#
+CRTVER="$MSVC_SDKVERSION.0"
 
 INCLUDE="$CRT\\include\\$CRTVER\\ucrt;$INCLUDE"
 LIB="$CRT\\lib\\$CRTVER\\ucrt\\x86;$LIB"
diff --git a/msvc-14/msvc-14u3-64 b/msvc-14/msvc-14u3-64
index deec271..9a4e202 100755
--- a/msvc-14/msvc-14u3-64
+++ b/msvc-14/msvc-14u3-64
@@ -8,11 +8,19 @@ if [ -z "$MSVC_INSTALLDIR" ]; then
   MSVC_INSTALLDIR="Microsoft Visual Studio 14.0"
 fi
 
+if [ -z "$MSVC_SDKVERSION" ]; then
+  source "$src_dir/msvc-common/msvc-sdk-common"
+  MSVC_SDKVERSION="$(windows10_sdkversion)"
+fi
+
 # SDK
 #
 SDK="C:\\Program Files (x86)\\Windows Kits\\10"
 SDKBIN="$SDK\\bin\\x64"
-SDKVER="10.0.14393.0"
+
+# Originally "10.0.14393" (if upgrade 14u2) or "10.0.10240" (if clean install).
+#
+SDKVER="$MSVC_SDKVERSION.0"
 
 INCLUDE="$SDK\\include\\$SDKVER\\shared;$SDK\\include\\$SDKVER\\um;$SDK\\include\\$SDKVER\\winrt"
 LIB="$SDK\\lib\\$SDKVER\\um\\x64"
@@ -20,7 +28,10 @@ LIB="$SDK\\lib\\$SDKVER\\um\\x64"
 # CRT
 #
 CRT="C:\\Program Files (x86)\\Windows Kits\\10"
-CRTVER="10.0.14393.0"
+
+# Originally "10.0.14393" (if upgrade 14u2) or "10.0.10240" (if clean install).
+#
+CRTVER="$MSVC_SDKVERSION.0"
 
 INCLUDE="$CRT\\include\\$CRTVER\\ucrt;$INCLUDE"
 LIB="$CRT\\lib\\$CRTVER\\ucrt\\x64;$LIB"