diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2017-11-05 00:07:31 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2017-11-05 00:07:31 (GMT) |
| commit | 40708cc7d2361518a2784afedf495eafcc099de5 (patch) | |
| tree | d847d0816f55b8acbd13b4c8b1670d8012fd59ea /PCbuild | |
| parent | 5c0100aec014b9e0a66884468cbfa3ac01e4bfbb (diff) | |
| download | cpython-40708cc7d2361518a2784afedf495eafcc099de5.zip cpython-40708cc7d2361518a2784afedf495eafcc099de5.tar.gz cpython-40708cc7d2361518a2784afedf495eafcc099de5.tar.bz2 | |
bpo-31944: Fixes build and Modify button (GH-4278) (#4284)
(cherry picked from commit 0d2a9088d16826343344b04461c8be44b4008710)
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/pyproject.props | 1 | ||||
| -rw-r--r-- | PCbuild/python.props | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index 5a2da99..9a096bc 100644 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -7,6 +7,7 @@ <OutDir Condition="!HasTrailingSlash($(OutDir))">$(OutDir)\</OutDir> <Py_IntDir Condition="'$(Py_IntDir)' == ''">$(MSBuildThisFileDirectory)obj\</Py_IntDir> <IntDir>$(Py_IntDir)\$(MajorVersionNumber)$(MinorVersionNumber)$(ArchName)_$(Configuration)\$(ProjectName)\</IntDir> + <IntDir>$(IntDir.Replace(`\\`, `\`))</IntDir> <TargetName Condition="'$(TargetName)' == ''">$(ProjectName)</TargetName> <TargetName>$(TargetName)$(PyDebugExt)</TargetName> <GenerateManifest>false</GenerateManifest> diff --git a/PCbuild/python.props b/PCbuild/python.props index c26f642..cf31586 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -72,8 +72,8 @@ possible version). Since we limit WINVER to Windows 7 anyway, it doesn't really matter which WinSDK version we use. --> - <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.15063'">10.0.15063.0</DefaultWindowsSDKVersion> - <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.15063'">10.0.15063.0</DefaultWindowsSDKVersion> + <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) >= '10.0.15063'">10.0.15063.0</DefaultWindowsSDKVersion> + <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) >= '10.0.15063'">10.0.15063.0</DefaultWindowsSDKVersion> <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.14393'">10.0.14393.0</DefaultWindowsSDKVersion> <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.14393'">10.0.14393.0</DefaultWindowsSDKVersion> <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.10586'">10.0.10586.0</DefaultWindowsSDKVersion> |