From 6513bb7b269ea8b39dfed0e86a2df9a01ee23416 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 28 Nov 2016 13:22:08 +0200
Subject: Add infrastructure for Windows 10 SDK discovery

---
 msvc-14/msvc-14u0-32 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'msvc-14')

diff --git a/msvc-14/msvc-14u0-32 b/msvc-14/msvc-14u0-32
index ec7b82b..2d101cd 100755
--- a/msvc-14/msvc-14u0-32
+++ b/msvc-14/msvc-14u0-32
@@ -8,6 +8,11 @@ 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"
+  MSVC_SDKVERSION="$(windows10_sdkversion)"
+fi
+
 # SDK
 #
 SDK="C:\\Program Files (x86)\\Windows Kits\\8.1"
@@ -19,7 +24,7 @@ LIB="$SDK\\lib\\winv6.3\\um\\x86"
 # CRT
 #
 CRT="C:\\Program Files (x86)\\Windows Kits\\10"
-CRTVER="10.0.10150.0"
+CRTVER="$MSVC_SDKVERSION.0" # Originally "10.0.10150".
 
 INCLUDE="$CRT\\include\\$CRTVER\\ucrt;$INCLUDE"
 LIB="$CRT\\lib\\$CRTVER\\ucrt\\x86;$LIB"
-- 
cgit v1.1