From 2fd703af6c9343c5944a7ab482b44b6dfe98aade Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 13 Jan 2020 15:02:36 +0100 Subject: [PATCH] makepanda: fix using Windows 8.1 SDK (which also requires UCRT) --- makepanda/makepandacore.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index 01a50199a7..d26bbeed9d 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -2843,8 +2843,8 @@ def SetupVisualStudioEnviron(): exit("Could not locate 64-bits libraries in Windows SDK directory!\nUsing directory: %s" % SDK["MSPLATFORM"]) # Targeting the 7.1 SDK (which is the only way to have Windows XP support) - # with Visual Studio 2015 requires use of the Universal CRT. - if winsdk_ver in ('7.1', '7.1A') and SDK["VISUALSTUDIO_VERSION"] >= (14,0): + # with Visual Studio 2015+ requires use of the Universal CRT. + if winsdk_ver in ('7.1', '7.1A', '8.0', '8.1') and SDK["VISUALSTUDIO_VERSION"] >= (14,0): win_kit = GetRegistryKey("SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots", "KitsRoot10") # Fallback in case we can't read the registry.