diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2015-01-04 04:33:10 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2015-01-04 04:33:10 (GMT) |
| commit | 7037cf7300d06bb9031cb02b4fcb41b8ebc4f743 (patch) | |
| tree | b1f8004aa6af1625b58b6c27e214a0548da1a918 /PCbuild | |
| parent | bc26646505efa997ed28a381b82f3f1b89a875e4 (diff) | |
| download | cpython-7037cf7300d06bb9031cb02b4fcb41b8ebc4f743.zip cpython-7037cf7300d06bb9031cb02b4fcb41b8ebc4f743.tar.gz cpython-7037cf7300d06bb9031cb02b4fcb41b8ebc4f743.tar.bz2 | |
Closes #23154: Fix unnecessary recompilation of OpenSSL on Windows
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/libeay.vcxproj | 6 | ||||
| -rw-r--r-- | PCbuild/openssl.props | 6 | ||||
| -rw-r--r-- | PCbuild/ssleay.vcxproj | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/PCbuild/libeay.vcxproj b/PCbuild/libeay.vcxproj index 4adec90..8348bc0 100644 --- a/PCbuild/libeay.vcxproj +++ b/PCbuild/libeay.vcxproj @@ -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" /> diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props index b64c3e1..356159e 100644 --- a/PCbuild/openssl.props +++ b/PCbuild/openssl.props @@ -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" /> diff --git a/PCbuild/ssleay.vcxproj b/PCbuild/ssleay.vcxproj index bd7dd40..f00c606 100644 --- a/PCbuild/ssleay.vcxproj +++ b/PCbuild/ssleay.vcxproj @@ -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" /> |