diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-01-15 09:10:16 -0800 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-01-15 09:10:16 -0800 |
| commit | 2587952f2fc4abb3adf6a838bf8a1fc3997c81be (patch) | |
| tree | 4c3004cb2dc2e833993cc1aa421fbd92e0d5b332 /PCbuild/python.props | |
| parent | a39eb0f42b8926aad10fe4f11371f0ec219da276 (diff) | |
| download | cpython-git-2587952f2fc4abb3adf6a838bf8a1fc3997c81be.tar.gz | |
Fixes sys.winver generation and removes dependency on user32.dll
Diffstat (limited to 'PCbuild/python.props')
| -rw-r--r-- | PCbuild/python.props | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/PCbuild/python.props b/PCbuild/python.props index 99eebf0fe2..788df56bdd 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" TreatAsLocalProperty="Platform"> <PropertyGroup> - <Platform Condition="'$(Platform)' == ''">Win32</Platform> + <Platform Condition="'$(Platform)' == '' or '$(Platform)' == 'x86'">Win32</Platform> <Configuration Condition="'$(Configuration)' == ''">Release</Configuration> <!-- Use the latest available version of Visual Studio to build. To override @@ -100,6 +100,10 @@ <!-- The version and platform tag to include in .pyd filenames --> <PydTag Condition="$(Platform) == 'Win32'">.cp$(MajorVersionNumber)$(MinorVersionNumber)-win32</PydTag> <PydTag Condition="$(Platform) == 'x64'">.cp$(MajorVersionNumber)$(MinorVersionNumber)-win_amd64</PydTag> + + <!-- The version number for sys.winver --> + <SysWinVer>$(MajorVersionNumber).$(MinorVersionNumber)</SysWinVer> + <SysWinVer Condition="$(Platform) == 'Win32'">$(SysWinVer)-32</SysWinVer> </PropertyGroup> <!-- Displays the calculated version info --> |