Build fixes for the fresh Windows 10 SDKS.

dse · dse · commit 6457aa823a65 · 2017-11-05T02:08:10.000+04:00
diff --git a/setup.py b/setup.py
@@ -40,6 +40,12 @@
 kits_suffix = os.path.join("bin", ARCH)
 
 WIN_SDK_KEYS = (
+    RegKey(sdk_name="Windows Kit 10.0", key=kits_root,
+           value_name="KitsRoot10", suffix=os.path.join("bin", "10.0.16299.0", ARCH)),
+
+    RegKey(sdk_name="Windows Kit 10.0", key=kits_root,
+           value_name="KitsRoot10", suffix=os.path.join("bin", "10.0.15063.0", ARCH)),
+
     RegKey(sdk_name="Windows Kit 10.0", key=kits_root,
            value_name="KitsRoot10", suffix=kits_suffix),
 
@@ -326,7 +332,7 @@ def _find_msbuild_tool(self, tool="msbuild.exe", use_windows_sdk=False):
         """Return full path to one of the Microsoft build tools"""
 
         # trying to search path with help of vswhere when MSBuild 15.0 and higher installed.
-        if use_windows_sdk==False:
+        if tool=="msbuild.exe" and use_windows_sdk==False:
             try:
                 basePathes = subprocess.check_output(
                     ["tools\\vswhere\\vswhere.exe", "-latest",
