diff options
| author | Paul Monson <paulmon@users.noreply.github.com> | 2019-05-15 22:38:55 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@python.org> | 2019-05-15 22:38:55 (GMT) |
| commit | fb7e7505ed1337bf40fa7b8b68317d1e86675a86 (patch) | |
| tree | 5448f7cb8bf06f7b6c04012c1903c8934f761fd0 /PCbuild/openssl.vcxproj | |
| parent | d9e006bcefe6fac859b1b5d741725b9a91991044 (diff) | |
| download | cpython-fb7e7505ed1337bf40fa7b8b68317d1e86675a86.zip cpython-fb7e7505ed1337bf40fa7b8b68317d1e86675a86.tar.gz cpython-fb7e7505ed1337bf40fa7b8b68317d1e86675a86.tar.bz2 | |
bpo-35926: Add support for OpenSSL 1.1.1b on Windows (GH-11779)
Diffstat (limited to 'PCbuild/openssl.vcxproj')
| -rw-r--r-- | PCbuild/openssl.vcxproj | 61 |
1 files changed, 33 insertions, 28 deletions
diff --git a/PCbuild/openssl.vcxproj b/PCbuild/openssl.vcxproj index 1a36d08..0da6f67 100644 --- a/PCbuild/openssl.vcxproj +++ b/PCbuild/openssl.vcxproj @@ -1,37 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Release|Win32"> <Configuration>Release</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="PGInstrument|Win32"> - <Configuration>PGInstrument</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="PGInstrument|x64"> - <Configuration>PGInstrument</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="PGUpdate|Win32"> - <Configuration>PGUpdate</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="PGUpdate|x64"> - <Configuration>PGUpdate</Configuration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> <Platform>x64</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> + <ProjectConfiguration Include="Release|ARM"> + <Configuration>Release</Configuration> + <Platform>ARM</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> + <ProjectConfiguration Include="Release|ARM64"> <Configuration>Release</Configuration> - <Platform>x64</Platform> + <Platform>ARM64</Platform> </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> @@ -40,15 +24,36 @@ <Import Project="python.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - - <PropertyGroup Label="Configuration"> + + <PropertyGroup Label="Configuration" Condition="$(Platform) == 'Win32'"> <ConfigurationType>Makefile</ConfigurationType> <Bitness>32</Bitness> - <Bitness Condition="$(Platform) == 'x64'">64</Bitness> <ArchName>x86</ArchName> - <ArchName Condition="$(Platform) == 'x64'">amd64</ArchName> <OpenSSLPlatform>VC-WIN32</OpenSSLPlatform> - <OpenSSLPlatform Condition="$(Platform) == 'x64'">VC-WIN64A</OpenSSLPlatform> + <SupportSigning>true</SupportSigning> + </PropertyGroup> + + <PropertyGroup Label="Configuration" Condition="$(Platform) == 'x64'"> + <ConfigurationType>Makefile</ConfigurationType> + <Bitness>64</Bitness> + <ArchName>amd64</ArchName> + <OpenSSLPlatform>VC-WIN64A-masm</OpenSSLPlatform> + <SupportSigning>true</SupportSigning> + </PropertyGroup> + + <PropertyGroup Label="Configuration" Condition="$(Platform) == 'ARM'"> + <ConfigurationType>Makefile</ConfigurationType> + <Bitness>ARM</Bitness> + <ArchName>ARM</ArchName> + <OpenSSLPlatform>VC-WIN32-ARM</OpenSSLPlatform> + <SupportSigning>true</SupportSigning> + </PropertyGroup> + + <PropertyGroup Label="Configuration" Condition="$(Platform) == 'ARM64'"> + <ConfigurationType>Makefile</ConfigurationType> + <Bitness>ARM64</Bitness> + <ArchName>ARM64</ArchName> + <OpenSSLPlatform>VC-WIN64-ARM</OpenSSLPlatform> <SupportSigning>true</SupportSigning> </PropertyGroup> |