Skip to content

Commit fdaa2c6

Browse files
i-shenlMatthewZMD
authored andcommitted
Allow py 2 to use openssl 3 on Windows
1 parent fb1acd8 commit fdaa2c6

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

PCbuild/openssl.props

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,27 @@
66
</ClCompile>
77
<Link>
88
<AdditionalLibraryDirectories>$(opensslLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
9-
<AdditionalDependencies>ws2_32.lib;libcrypto.lib;libssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
9+
<AdditionalDependencies>ws2_32.lib;$(opensslLibDir)\libcrypto.lib;$(opensslLibDir)\libssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
1010
</Link>
1111
</ItemDefinitionGroup>
1212
<PropertyGroup>
13-
<_DLLSuffix>-1_1</_DLLSuffix>
13+
<SSLMajorVersion>$(SSL_MAJOR_VERSION)</SSLMajorVersion>
14+
<SSLMajorVersion Condition="$(SSLMajorVersion) == ''">3</SSLMajorVersion>
15+
<SSLMinorVersion>$(SSL_MINOR_VERSION)</SSLMinorVersion>
16+
<SSLMinorVersion Condition="$(SSLMinorVersion) == ''">0</SSLMinorVersion>
17+
<SSLVersion>$(SSLMajorVersion)_$(SSLMinorVersion)</SSLVersion>
18+
<SSLVersion Condition="$(SSLMinorVersion) == '0'">$(SSLMajorVersion)</SSLVersion>
19+
<SSLVersion Condition="$(SSLMajorVersion) == '3'">$(SSLMajorVersion)</SSLVersion>
20+
<_DLLSuffix>-$(SSLVersion)</_DLLSuffix>
21+
<_DLLSuffix Condition="$(Platform) == 'x64'">$(_DLLSuffix)-x64</_DLLSuffix>
1422
<_DLLSuffix Condition="$(Platform) == 'ARM'">$(_DLLSuffix)-arm</_DLLSuffix>
1523
<_DLLSuffix Condition="$(Platform) == 'ARM64'">$(_DLLSuffix)-arm64</_DLLSuffix>
1624
</PropertyGroup>
1725
<ItemGroup>
18-
<_SSLDLL Include="$(opensslLibDir)\libcrypto$(_DLLSuffix).dll" />
19-
<_SSLDLL Include="$(opensslLibDir)\libcrypto$(_DLLSuffix).pdb" />
20-
<_SSLDLL Include="$(opensslLibDir)\libssl$(_DLLSuffix).dll" />
21-
<_SSLDLL Include="$(opensslLibDir)\libssl$(_DLLSuffix).pdb" />
26+
<_SSLDLL Include="$(opensslBinDir)\libcrypto$(_DLLSuffix).dll" />
27+
<_SSLDLL Include="$(opensslBinDir)\libcrypto$(_DLLSuffix).pdb" />
28+
<_SSLDLL Include="$(opensslBinDir)\libssl$(_DLLSuffix).dll" />
29+
<_SSLDLL Include="$(opensslBinDir)\libssl$(_DLLSuffix).pdb" />
2230
</ItemGroup>
2331
<Target Name="_CopySSLDLL" Inputs="@(_SSLDLL)" Outputs="@(_SSLDLL->'$(OutDir)%(Filename)%(Extension)')" AfterTargets="Build">
2432
<Copy SourceFiles="@(_SSLDLL)" DestinationFolder="$(OutDir)" />

0 commit comments

Comments
 (0)