summaryrefslogtreecommitdiffstats
path: root/PCbuild/openssl.props
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2016-02-22 10:08:51 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2016-02-22 10:08:51 (GMT)
commit6fe57ad229d46516c1ead1d37c015824b2428746 (patch)
tree4a9478521f27892bd3d6414bb0f29d2652e02b17 /PCbuild/openssl.props
parent16f164e9b8b25b4c3e203249be44e910b0ee5827 (diff)
downloadcpython-6fe57ad229d46516c1ead1d37c015824b2428746.zip
cpython-6fe57ad229d46516c1ead1d37c015824b2428746.tar.gz
cpython-6fe57ad229d46516c1ead1d37c015824b2428746.tar.bz2
Issue #26268: Update Windows builds to use OpenSSL 1.0.2f
Diffstat (limited to 'PCbuild/openssl.props')
-rw-r--r--PCbuild/openssl.props7
1 files changed, 3 insertions, 4 deletions
diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props
index d094e59..e35c0d9 100644
--- a/PCbuild/openssl.props
+++ b/PCbuild/openssl.props
@@ -17,9 +17,8 @@
<PreprocessorDefinitions Include="_CRT_SECURE_NO_WARNINGS" />
<PreprocessorDefinitions Include="_CRT_SECURE_NO_DEPRECATE" />
<PreprocessorDefinitions Include="OPENSSL_THREADS" />
- <PreprocessorDefinitions Include="OPENSSL_SYSNAME_WIN32" />
+ <!-- <PreprocessorDefinitions Include="OPENSSL_SYSNAME_WIN32" /> -->
<PreprocessorDefinitions Include="OPENSSL_IA32_SSE2" />
- <PreprocessorDefinitions Include="OPENSSL_CPUID_OBJ" />
<PreprocessorDefinitions Include="SHA1_ASM" />
<PreprocessorDefinitions Include="SHA256_ASM" />
<PreprocessorDefinitions Include="SHA512_ASM" />
@@ -53,7 +52,7 @@
<ClCompile>
<!-- Suppress 64-bit truncation warnings - they aren't ours to worry about -->
<DisableSpecificWarnings>4244;4267</DisableSpecificWarnings>
- <AdditionalIncludeDirectories>$(opensslDir);$(opensslDir)include;$(opensslDir)crypto;$(opensslDir)crypto\asn1;$(opensslDir)crypto\evp;$(opensslDir)crypto\modes</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(opensslDir);$(opensslIncludeDir);$(opensslDir)crypto;$(opensslDir)crypto\asn1;$(opensslDir)crypto\evp;$(opensslDir)crypto\modes</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(_PreprocessorDefinitionList);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
@@ -74,4 +73,4 @@ $(nasm) -o "$(IntDir)%(NasmCompile.Filename).obj" "%(NasmCompile.FullPath)"' />
<Lib Include="$(IntDir)%(NasmCompile.Filename).obj" />
</ItemGroup>
</Target>
-</Project> \ No newline at end of file
+</Project>