diff options
| author | Paul Monson <paulmon@users.noreply.github.com> | 2019-05-17 17:07:24 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@python.org> | 2019-05-17 17:07:24 (GMT) |
| commit | f96e7fd9240c1ce13f52bd3ba81f58b2511d89c3 (patch) | |
| tree | 8308057eebe43b7d81dbe0bc481bf3dd1165ad17 /PCbuild/python.props | |
| parent | cab5d0741ee6adf2ae9ff5aaafe06b75b4b5bca3 (diff) | |
| download | cpython-f96e7fd9240c1ce13f52bd3ba81f58b2511d89c3.zip cpython-f96e7fd9240c1ce13f52bd3ba81f58b2511d89c3.tar.gz cpython-f96e7fd9240c1ce13f52bd3ba81f58b2511d89c3.tar.bz2 | |
bpo-36941: Windows build changes for Windows ARM64 (GH-13365)
Diffstat (limited to 'PCbuild/python.props')
| -rw-r--r-- | PCbuild/python.props | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/PCbuild/python.props b/PCbuild/python.props index b3e5b92..11638fe 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -40,9 +40,12 @@ <BuildPath64 Condition="'$(Py_OutDir)' != ''">$(Py_OutDir)\amd64\</BuildPath64> <BuildPathArm32 Condition="'$(Py_OutDir)' == ''">$(PySourcePath)PCbuild\arm32\</BuildPathArm32> <BuildPathArm32 Condition="'$(Py_OutDir)' != ''">$(Py_OutDir)\arm32\</BuildPathArm32> + <BuildPathArm64 Condition="'$(Py_OutDir)' == ''">$(PySourcePath)PCbuild\arm64\</BuildPathArm64> + <BuildPathArm64 Condition="'$(Py_OutDir)' != ''">$(Py_OutDir)\arm64\</BuildPathArm64> <BuildPath Condition="'$(ArchName)' == 'win32'">$(BuildPath32)</BuildPath> <BuildPath Condition="'$(ArchName)' == 'amd64'">$(BuildPath64)</BuildPath> <BuildPath Condition="'$(ArchName)' == 'arm32'">$(BuildPathArm32)</BuildPath> + <BuildPath Condition="'$(ArchName)' == 'arm64'">$(BuildPathArm64)</BuildPath> <BuildPath Condition="'$(BuildPath)' == ''">$(PySourcePath)PCbuild\$(ArchName)\</BuildPath> <BuildPath Condition="!HasTrailingSlash($(BuildPath))">$(BuildPath)\</BuildPath> <BuildPath Condition="$(Configuration) == 'PGInstrument'">$(BuildPath)instrumented\</BuildPath> @@ -72,6 +75,7 @@ <!-- Suffix for versions/keys when building for particular platforms --> <PyArchExt Condition="'$(ArchName)' == 'win32'">-32</PyArchExt> <PyArchExt Condition="'$(ArchName)' == 'arm32'">-arm32</PyArchExt> + <PyArchExt Condition="'$(ArchName)' == 'arm64'">-arm64</PyArchExt> <!-- Full path of the resulting python.exe binary --> <PythonExe Condition="'$(PythonExe)' == ''">$(BuildPath)python$(PyDebugExt).exe</PythonExe> @@ -81,6 +85,10 @@ <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport> </PropertyGroup> + <PropertyGroup Condition="'$(Platform)'=='ARM64'" Label="Arm64Configuration"> + <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport> + </PropertyGroup> + <PropertyGroup Condition="$(DefaultWindowsSDKVersion) == ''"> <!-- Attempt to select the latest installed WinSDK. If we don't find any, then we will @@ -194,6 +202,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) == 'arm64'">.cp$(MajorVersionNumber)$(MinorVersionNumber)-win_arm64</PydTag> <PydTag Condition="$(ArchName) == 'amd64'">.cp$(MajorVersionNumber)$(MinorVersionNumber)-win_amd64</PydTag> <!-- The version number for sys.winver --> |