commit c46a2ebaff1be90707ef28656649bca025e8e395
author Zachary Ware <zachary.ware@gmail.com> Mon Feb 22 04:08:30 2016 -0600
committer Zachary Ware <zachary.ware@gmail.com> Mon Feb 22 04:08:30 2016 -0600
tree 3202f853129ee5ca1f9fd4184e2b55e78b59d291
parent be9ddc1d113026f9f5bd9a3f1eda1d56d47b60e8

Issue #26268: Update Windows builds to use OpenSSL 1.0.2f

PCbuild/openssl.props

diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props
index 54f3596..e45964e 100644
--- a/PCbuild/openssl.props
+++ b/PCbuild/openssl.props
@@ -15,9 +15,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" />
@@ -51,7 +50,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>