traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Closes #23154: Fix unnecessary recompilation of OpenSSL on Windows

This commit is contained in:
Zachary Ware 2015-01-03 22:33:10 -06:00
parent bc26646505
commit 7037cf7300
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PCbuild/libeay.vcxproj
View File

@ -42,12 +42,6 @@
<Import Project="python.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="openssl.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<IntDir Condition="'$(Platform)' != 'x64'">$(opensslDir)tmp32\libeay\</IntDir>
<IntDir Condition="'$(Platform)' == 'x64'">$(opensslDir)tmp64\libeay\</IntDir>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

6
PCbuild/openssl.props
View File

@ -2,6 +2,12 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="pyproject.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<IntDir>$(opensslDir)tmp\$(ArchName)_$(Configuration)\$(ProjectName)\</IntDir>
<IntDir Condition="$(Configuration) == 'PGInstrument' or $(Configuration) == 'PGUpdate'">$(opensslDir)tmp\$(ArchName)\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemGroup>
<PreprocessorDefinitions Include="DSO_WIN32" />
<PreprocessorDefinitions Include="WIN32_LEAN_AND_MEAN" />

6
PCbuild/ssleay.vcxproj
View File

@ -42,12 +42,6 @@
<Import Project="python.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="openssl.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<IntDir Condition="'$(Platform)' != 'x64'">$(opensslDir)tmp32\ssleay\</IntDir>
<IntDir Condition="'$(Platform)' == 'x64'">$(opensslDir)tmp64\ssleay\</IntDir>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />