From 0df42e969a0db8c1ae84f7bb022e824576a2b87a Mon Sep 17 00:00:00 2001 From: Brian Gladman Date: Thu, 25 May 2017 09:27:11 +0100 Subject: [PATCH] set the default Windows SDK for Visual Studio 2012, 2013, 2015 and 2017 builds --- build.vc/_msvc_project.py | 7 ++++--- build.vc11/version_info.py | 4 +++- build.vc12/version_info.py | 4 +++- build.vc14/version_info.py | 4 +++- build.vc15/version_info.py | 5 ++++- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/build.vc/_msvc_project.py b/build.vc/_msvc_project.py index b50815de..cdfe1ac9 100644 --- a/build.vc/_msvc_project.py +++ b/build.vc/_msvc_project.py @@ -29,15 +29,16 @@ def vcx_proj_cfg(plat, outf): outf.write(f2.format(pl, conf)) outf.write(f3) -def vcx_globals(name, guid, outf): +def vcx_globals(name, guid, vs_info, outf): f1 = r''' {0:s} Win32Proj {1:s} + {2:s} ''' - outf.write(f1.format(name, guid)) + outf.write(f1.format(name, guid, vs_info['windows_sdk'])) def vcx_default_cpp_props(outf): @@ -260,7 +261,7 @@ def gen_vcxproj(path, root_dir, proj_name, guid, config, plat, proj_type, with open(path, 'w') as outf: outf.write(f1.format(vs_info['vcx_tool'])) vcx_proj_cfg(plat, outf) - vcx_globals(proj_name, guid, outf) + vcx_globals(proj_name, guid, vs_info, outf) vcx_default_cpp_props(outf) vcx_library_type(plat, proj_type, vs_info, outf) vcx_cpp_props(outf) diff --git a/build.vc11/version_info.py b/build.vc11/version_info.py index 8b354d3b..4940e20d 100644 --- a/build.vc11/version_info.py +++ b/build.vc11/version_info.py @@ -5,10 +5,12 @@ # microsoft compiler version # microsoft compiler version (long) # vcx project tools version +# windows SDK version vs_info = { 'solution':'12', 'visual studio':'2012', 'msvc':'11', 'msvc_long':'11', 'vcx_tool':'4.0', - 'platform_toolset':'110' + 'platform_toolset':'110', + 'windows_sdk':'8.0.50727' } diff --git a/build.vc12/version_info.py b/build.vc12/version_info.py index dca26534..f796a550 100644 --- a/build.vc12/version_info.py +++ b/build.vc12/version_info.py @@ -5,10 +5,12 @@ # microsoft compiler version # microsoft compiler version (long) # vcx project tools version +# windows SDK version vs_info = { 'solution':'12', 'visual studio':'2013', 'msvc':'12', 'msvc_long':'12.0.20827.3', 'vcx_tool':'12.0', - 'platform_toolset':'120' + 'platform_toolset':'120', + 'windows_sdk':'8.1.51636' } diff --git a/build.vc14/version_info.py b/build.vc14/version_info.py index a699b162..84d1ccaa 100644 --- a/build.vc14/version_info.py +++ b/build.vc14/version_info.py @@ -5,10 +5,12 @@ # microsoft compiler version # microsoft compiler version (long) # vcx project tools version +# windows SDK version vs_info = { 'solution':'12', 'visual studio':'14', 'msvc':'14', 'msvc_long':'14.0.24720.0', 'vcx_tool':'14.0', - 'platform_toolset':'140' + 'platform_toolset':'140', + 'windows_sdk':'10.0.10240.0' } diff --git a/build.vc15/version_info.py b/build.vc15/version_info.py index 402aeb9f..b525c6bf 100644 --- a/build.vc15/version_info.py +++ b/build.vc15/version_info.py @@ -5,10 +5,13 @@ # microsoft compiler version # microsoft compiler version (long) # vcx project tools version +# windows SDK version vs_info = { 'solution':'12', 'visual studio':'15', 'msvc':'15', 'msvc_long':'15.0', 'vcx_tool':'15.0.25914.0', - 'platform_toolset':'141' + 'platform_toolset':'141', + 'windows_sdk':'10.0.15063.0' # Windows 10 Creators Update + # 'windows_sdk':'10.0.14393.795' # Windows 10 }