FS-5307 --resolve

diff --git a/libs/win32/openssl/libeay32.2010.vcxproj b/libs/win32/openssl/libeay32.2010.vcxproj
index 406e7f61384b72343796721915a482d766d7d12f..23119ab5c199a71d5db72f81c21e60a45544fe4d 100644 (file)
--- a/libs/win32/openssl/libeay32.2010.vcxproj
+++ b/libs/win32/openssl/libeay32.2010.vcxproj
@@ -90,12 +90,12 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\e_os.h" xcopy "$
     </PreBuildEvent>\r
     <ClCompile>\r
       <AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>\r
-      <Optimization>Full</Optimization>\r
+      <Optimization>Disabled</Optimization>\r
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>\r
       <AdditionalIncludeDirectories>..\..\openssl-1.0.1c\include;..\..\openssl-1.0.1c\crypto;..\..\openssl-1.0.1c\crypto\aes;..\..\openssl-1.0.1c\crypto\asn1;..\..\openssl-1.0.1c\crypto\bf;..\..\openssl-1.0.1c\crypto\bio;..\..\openssl-1.0.1c\crypto\bn;..\..\openssl-1.0.1c\crypto\buffer;..\..\openssl-1.0.1c\crypto\camellia;..\..\openssl-1.0.1c\crypto\cast;..\..\openssl-1.0.1c\crypto\cms;..\..\openssl-1.0.1c\crypto\comp;..\..\openssl-1.0.1c\crypto\conf;..\..\openssl-1.0.1c\crypto\des;..\..\openssl-1.0.1c\crypto\dh;..\..\openssl-1.0.1c\crypto\dsa;..\..\openssl-1.0.1c\crypto\dso;..\..\openssl-1.0.1c\crypto\ec;..\..\openssl-1.0.1c\crypto\ecdh;..\..\openssl-1.0.1c\crypto\ecdsa;..\..\openssl-1.0.1c\crypto\engine;..\..\openssl-1.0.1c\crypto\err;..\..\openssl-1.0.1c\crypto\evp;..\..\openssl-1.0.1c\crypto\modes;..\..\openssl-1.0.1c\ms;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WINDOWS;WIN32;_DEBUG;_CRT_NON_CONFORMING_SWPRINTFS;OPENSSL_THREADS;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_NO_ASM;OPENSSL_NO_GMP;OPENSSL_NO_JPAKE;OPENSSL_NO_KRB5;OPENSSL_NO_MD2;OPENSSL_NO_RFC3779;OPENSSL_NO_STORE;OPENSSL_NO_STATIC_ENGINE;OPENSSL_BUILD_SHLIBCRYPTO;MK1MF_BUILD;OPENSSL_NO_SCTP;OPENSSL_NO_EC_NISTP_64_GCC_128;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
@@ -127,12 +127,12 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\e_os.h" xcopy "$
     </Midl>\r
     <ClCompile>\r
       <AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>\r
-      <Optimization>Full</Optimization>\r
+      <Optimization>Disabled</Optimization>\r
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>\r
       <AdditionalIncludeDirectories>..\..\openssl-1.0.1c\include;..\..\openssl-1.0.1c\crypto;..\..\openssl-1.0.1c\crypto\aes;..\..\openssl-1.0.1c\crypto\asn1;..\..\openssl-1.0.1c\crypto\bf;..\..\openssl-1.0.1c\crypto\bio;..\..\openssl-1.0.1c\crypto\bn;..\..\openssl-1.0.1c\crypto\buffer;..\..\openssl-1.0.1c\crypto\camellia;..\..\openssl-1.0.1c\crypto\cast;..\..\openssl-1.0.1c\crypto\cms;..\..\openssl-1.0.1c\crypto\comp;..\..\openssl-1.0.1c\crypto\conf;..\..\openssl-1.0.1c\crypto\des;..\..\openssl-1.0.1c\crypto\dh;..\..\openssl-1.0.1c\crypto\dsa;..\..\openssl-1.0.1c\crypto\dso;..\..\openssl-1.0.1c\crypto\ec;..\..\openssl-1.0.1c\crypto\ecdh;..\..\openssl-1.0.1c\crypto\ecdsa;..\..\openssl-1.0.1c\crypto\engine;..\..\openssl-1.0.1c\crypto\err;..\..\openssl-1.0.1c\crypto\evp;..\..\openssl-1.0.1c\crypto\modes;..\..\openssl-1.0.1c\ms;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WINDOWS;WIN32;_DEBUG;_CRT_NON_CONFORMING_SWPRINTFS;OPENSSL_THREADS;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_NO_ASM;OPENSSL_NO_GMP;OPENSSL_NO_JPAKE;OPENSSL_NO_KRB5;OPENSSL_NO_MD2;OPENSSL_NO_RFC3779;OPENSSL_NO_STORE;OPENSSL_NO_STATIC_ENGINE;OPENSSL_BUILD_SHLIBCRYPTO;MK1MF_BUILD;OPENSSL_NO_SCTP;OPENSSL_NO_EC_NISTP_64_GCC_128;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r

diff --git a/libs/win32/openssl/libeay32.2012.vcxproj b/libs/win32/openssl/libeay32.2012.vcxproj
index 01a28694ca35ebda2ab2f119cdce41e860457297..5d387c1ae0b23a6ac2d916506abdb33884ead912 100644 (file)
--- a/libs/win32/openssl/libeay32.2012.vcxproj
+++ b/libs/win32/openssl/libeay32.2012.vcxproj
@@ -94,12 +94,12 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\e_os.h" xcopy "$
     </PreBuildEvent>\r
     <ClCompile>\r
       <AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>\r
-      <Optimization>Full</Optimization>\r
+      <Optimization>Disabled</Optimization>\r
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>\r
       <AdditionalIncludeDirectories>..\..\openssl-1.0.1c\include;..\..\openssl-1.0.1c\crypto;..\..\openssl-1.0.1c\crypto\aes;..\..\openssl-1.0.1c\crypto\asn1;..\..\openssl-1.0.1c\crypto\bf;..\..\openssl-1.0.1c\crypto\bio;..\..\openssl-1.0.1c\crypto\bn;..\..\openssl-1.0.1c\crypto\buffer;..\..\openssl-1.0.1c\crypto\camellia;..\..\openssl-1.0.1c\crypto\cast;..\..\openssl-1.0.1c\crypto\cms;..\..\openssl-1.0.1c\crypto\comp;..\..\openssl-1.0.1c\crypto\conf;..\..\openssl-1.0.1c\crypto\des;..\..\openssl-1.0.1c\crypto\dh;..\..\openssl-1.0.1c\crypto\dsa;..\..\openssl-1.0.1c\crypto\dso;..\..\openssl-1.0.1c\crypto\ec;..\..\openssl-1.0.1c\crypto\ecdh;..\..\openssl-1.0.1c\crypto\ecdsa;..\..\openssl-1.0.1c\crypto\engine;..\..\openssl-1.0.1c\crypto\err;..\..\openssl-1.0.1c\crypto\evp;..\..\openssl-1.0.1c\crypto\modes;..\..\openssl-1.0.1c\ms;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WINDOWS;WIN32;_DEBUG;_CRT_NON_CONFORMING_SWPRINTFS;OPENSSL_THREADS;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_NO_ASM;OPENSSL_NO_GMP;OPENSSL_NO_JPAKE;OPENSSL_NO_KRB5;OPENSSL_NO_MD2;OPENSSL_NO_RFC3779;OPENSSL_NO_STORE;OPENSSL_NO_STATIC_ENGINE;OPENSSL_BUILD_SHLIBCRYPTO;MK1MF_BUILD;OPENSSL_NO_SCTP;OPENSSL_NO_EC_NISTP_64_GCC_128;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
@@ -131,12 +131,12 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\e_os.h" xcopy "$
     </Midl>\r
     <ClCompile>\r
       <AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>\r
-      <Optimization>Full</Optimization>\r
+      <Optimization>Disabled</Optimization>\r
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>\r
       <AdditionalIncludeDirectories>..\..\openssl-1.0.1c\include;..\..\openssl-1.0.1c\crypto;..\..\openssl-1.0.1c\crypto\aes;..\..\openssl-1.0.1c\crypto\asn1;..\..\openssl-1.0.1c\crypto\bf;..\..\openssl-1.0.1c\crypto\bio;..\..\openssl-1.0.1c\crypto\bn;..\..\openssl-1.0.1c\crypto\buffer;..\..\openssl-1.0.1c\crypto\camellia;..\..\openssl-1.0.1c\crypto\cast;..\..\openssl-1.0.1c\crypto\cms;..\..\openssl-1.0.1c\crypto\comp;..\..\openssl-1.0.1c\crypto\conf;..\..\openssl-1.0.1c\crypto\des;..\..\openssl-1.0.1c\crypto\dh;..\..\openssl-1.0.1c\crypto\dsa;..\..\openssl-1.0.1c\crypto\dso;..\..\openssl-1.0.1c\crypto\ec;..\..\openssl-1.0.1c\crypto\ecdh;..\..\openssl-1.0.1c\crypto\ecdsa;..\..\openssl-1.0.1c\crypto\engine;..\..\openssl-1.0.1c\crypto\err;..\..\openssl-1.0.1c\crypto\evp;..\..\openssl-1.0.1c\crypto\modes;..\..\openssl-1.0.1c\ms;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WINDOWS;WIN32;_DEBUG;_CRT_NON_CONFORMING_SWPRINTFS;OPENSSL_THREADS;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_NO_ASM;OPENSSL_NO_GMP;OPENSSL_NO_JPAKE;OPENSSL_NO_KRB5;OPENSSL_NO_MD2;OPENSSL_NO_RFC3779;OPENSSL_NO_STORE;OPENSSL_NO_STATIC_ENGINE;OPENSSL_BUILD_SHLIBCRYPTO;MK1MF_BUILD;OPENSSL_NO_SCTP;OPENSSL_NO_EC_NISTP_64_GCC_128;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r

diff --git a/libs/win32/openssl/openssl.2010.vcxproj b/libs/win32/openssl/openssl.2010.vcxproj
index 673028caff3dec7815c845f3b7448c86b8e595ef..fcc3f9e41c21b0c5686b6a715a35ea90972c9c96 100644 (file)
--- a/libs/win32/openssl/openssl.2010.vcxproj
+++ b/libs/win32/openssl/openssl.2010.vcxproj
@@ -80,7 +80,7 @@
       <StringPooling>true</StringPooling>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>\r
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
@@ -140,7 +140,7 @@
       <StringPooling>true</StringPooling>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>\r
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r

diff --git a/libs/win32/openssl/openssl.2012.vcxproj b/libs/win32/openssl/openssl.2012.vcxproj
index 8940fad85267cdc1152da5a146b5bec197f6cdb7..3c1fc97a01cba8a7c7461c19359bbfad875214cd 100644 (file)
--- a/libs/win32/openssl/openssl.2012.vcxproj
+++ b/libs/win32/openssl/openssl.2012.vcxproj
@@ -84,7 +84,7 @@
       <StringPooling>true</StringPooling>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>\r
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
@@ -144,7 +144,7 @@
       <StringPooling>true</StringPooling>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>\r
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r

diff --git a/libs/win32/openssl/ssleay32.2010.vcxproj b/libs/win32/openssl/ssleay32.2010.vcxproj
index 1dc2dadeef359e03a402abea8b584fc3af186c6a..18b05a6d66171d353394b39e1436b1d8c7ae4c64 100644 (file)
--- a/libs/win32/openssl/ssleay32.2010.vcxproj
+++ b/libs/win32/openssl/ssleay32.2010.vcxproj
@@ -84,12 +84,12 @@
     </PreBuildEvent>\r
     <ClCompile>\r
       <AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>\r
-      <Optimization>MaxSpeed</Optimization>\r
+      <Optimization>Disabled</Optimization>\r
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>\r
       <AdditionalIncludeDirectories>..\..\openssl-1.0.1c\include;..\..\openssl-1.0.1c\crypto;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;DSO_WIN32;OPENSSL_THREADS;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;_WINDLL;OPENSSL_BUILD_SHLIBSSL;OPENSSL_NO_SCTP;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
@@ -141,12 +141,12 @@
     </Midl>\r
     <ClCompile>\r
       <AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>\r
-      <Optimization>MaxSpeed</Optimization>\r
+      <Optimization>Disabled</Optimization>\r
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>\r
       <AdditionalIncludeDirectories>..\..\openssl-1.0.1c\include;..\..\openssl-1.0.1c\crypto;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;DSO_WIN32;OPENSSL_THREADS;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;_WINDLL;OPENSSL_BUILD_SHLIBSSL;OPENSSL_NO_SCTP;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r

diff --git a/libs/win32/openssl/ssleay32.2012.vcxproj b/libs/win32/openssl/ssleay32.2012.vcxproj
index 5239257b6c758629beedfbb7360e95f0f8bcae95..f362ef2d8b03e2638439bcbfa5fd76a7fa96c807 100644 (file)
--- a/libs/win32/openssl/ssleay32.2012.vcxproj
+++ b/libs/win32/openssl/ssleay32.2012.vcxproj
@@ -93,7 +93,7 @@
       <AdditionalIncludeDirectories>..\..\openssl-1.0.1c\include;..\..\openssl-1.0.1c\crypto;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;DSO_WIN32;OPENSSL_THREADS;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;_WINDLL;OPENSSL_BUILD_SHLIBSSL;OPENSSL_NO_SCTP;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
@@ -150,7 +150,7 @@
       <AdditionalIncludeDirectories>..\..\openssl-1.0.1c\include;..\..\openssl-1.0.1c\crypto;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;DSO_WIN32;OPENSSL_THREADS;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;_WINDLL;OPENSSL_BUILD_SHLIBSSL;OPENSSL_NO_SCTP;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r