diff options
author | Paul Monson <paulmon@users.noreply.github.com> | 2019-02-14 16:31:30 (GMT) |
---|---|---|
committer | Steve Dower <steve.dower@microsoft.com> | 2019-02-14 16:31:30 (GMT) |
commit | 8a1657b93469580ef345c7c91738587f3d76e87d (patch) | |
tree | 153202aa02cbd97a4214a4a265b35662f2b9c76f /PCbuild/python.props | |
parent | bb3c05d7efca8d23bf39bc2640297ba2598899f3 (diff) | |
download | cpython-8a1657b93469580ef345c7c91738587f3d76e87d.zip cpython-8a1657b93469580ef345c7c91738587f3d76e87d.tar.gz cpython-8a1657b93469580ef345c7c91738587f3d76e87d.tar.bz2 |
bpo-35976: Enable Windows projects to build with platform ARM32 (GH-11825)
This change adds the necessary items to the build projects to avoid erroring out right at the start. It does not add _support_ for targeting Windows on ARM32, but is a necessary prerequisite for adding it.
Diffstat (limited to 'PCbuild/python.props')
-rw-r--r-- | PCbuild/python.props | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/PCbuild/python.props b/PCbuild/python.props index f83d4df..a9dc9db 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -25,6 +25,7 @@ so we define our own constant ArchName and use wherever we need it. --> <ArchName Condition="'$(ArchName)' == '' and $(Platform) == 'x64'">amd64</ArchName> + <ArchName Condition="'$(ArchName)' == '' and $(Platform) == 'ARM'">arm32</ArchName> <ArchName Condition="'$(ArchName)' == ''">win32</ArchName> <!-- Root directory of the repository --> @@ -36,8 +37,11 @@ <BuildPath32 Condition="'$(Py_OutDir)' != ''">$(Py_OutDir)\win32\</BuildPath32> <BuildPath64 Condition="'$(Py_OutDir)' == ''">$(PySourcePath)PCbuild\amd64\</BuildPath64> <BuildPath64 Condition="'$(Py_OutDir)' != ''">$(Py_OutDir)\amd64\</BuildPath64> + <BuildPathArm32 Condition="'$(Py_OutDir)' == ''">$(PySourcePath)PCbuild\arm32\</BuildPathArm32> + <BuildPathArm32 Condition="'$(Py_OutDir)' != ''">$(Py_OutDir)\arm32\</BuildPathArm32> <BuildPath Condition="'$(ArchName)' == 'win32'">$(BuildPath32)</BuildPath> <BuildPath Condition="'$(ArchName)' == 'amd64'">$(BuildPath64)</BuildPath> + <BuildPath Condition="'$(ArchName)' == 'arm32'">$(BuildPathArm32)</BuildPath> <BuildPath Condition="'$(BuildPath)' == ''">$(PySourcePath)PCbuild\$(ArchName)\</BuildPath> <BuildPath Condition="!HasTrailingSlash($(BuildPath))">$(BuildPath)\</BuildPath> <BuildPath Condition="$(Configuration) == 'PGInstrument'">$(BuildPath)instrumented\</BuildPath> @@ -63,11 +67,16 @@ <!-- Suffix for versions/keys when building for particular platforms --> <PyArchExt Condition="'$(ArchName)' == 'win32'">-32</PyArchExt> + <PyArchExt Condition="'$(ArchName)' == 'arm32'">-arm32</PyArchExt> <!-- Full path of the resulting python.exe binary --> <PythonExe Condition="'$(PythonExe)' == ''">$(BuildPath)python$(PyDebugExt).exe</PythonExe> </PropertyGroup> + <PropertyGroup Condition="'$(Platform)'=='ARM'" Label="ArmConfiguration"> + <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport> + </PropertyGroup> + <PropertyGroup Condition="$(DefaultWindowsSDKVersion) == ''"> <!-- Attempt to select the latest installed WinSDK. If we don't find any, then we will @@ -180,6 +189,7 @@ <!-- The version and platform tag to include in .pyd filenames --> <PydTag Condition="$(ArchName) == 'win32'">.cp$(MajorVersionNumber)$(MinorVersionNumber)-win32</PydTag> + <PydTag Condition="$(ArchName) == 'arm32'">.cp$(MajorVersionNumber)$(MinorVersionNumber)-win_arm32</PydTag> <PydTag Condition="$(ArchName) == 'amd64'">.cp$(MajorVersionNumber)$(MinorVersionNumber)-win_amd64</PydTag> <!-- The version number for sys.winver --> |