From 0afcde5440085f71350d859758990a44c03752cd Mon Sep 17 00:00:00 2001 From: Jeff Lenk Date: Sun, 14 Apr 2013 21:18:48 -0500 Subject: [PATCH] FS-5307 --resolve --- libs/win32/openssl/libeay32.2010.vcxproj | 8 ++++---- libs/win32/openssl/libeay32.2012.vcxproj | 8 ++++---- libs/win32/openssl/openssl.2010.vcxproj | 4 ++-- libs/win32/openssl/openssl.2012.vcxproj | 4 ++-- libs/win32/openssl/ssleay32.2010.vcxproj | 8 ++++---- libs/win32/openssl/ssleay32.2012.vcxproj | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/libs/win32/openssl/libeay32.2010.vcxproj b/libs/win32/openssl/libeay32.2010.vcxproj index ce341a547a..9a770e0241 100644 --- 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.0a\include\openssl\e_os.h" xcopy "$ /Gs0 %(AdditionalOptions) - Full + Disabled AnySuitable ..\..\openssl-1.0.0a\include;..\..\openssl-1.0.0a\crypto;..\..\openssl-1.0.0a\crypto\aes;..\..\openssl-1.0.0a\crypto\asn1;..\..\openssl-1.0.0a\crypto\bf;..\..\openssl-1.0.0a\crypto\bio;..\..\openssl-1.0.0a\crypto\bn;..\..\openssl-1.0.0a\crypto\buffer;..\..\openssl-1.0.0a\crypto\camellia;..\..\openssl-1.0.0a\crypto\cast;..\..\openssl-1.0.0a\crypto\cms;..\..\openssl-1.0.0a\crypto\comp;..\..\openssl-1.0.0a\crypto\conf;..\..\openssl-1.0.0a\crypto\des;..\..\openssl-1.0.0a\crypto\dh;..\..\openssl-1.0.0a\crypto\dsa;..\..\openssl-1.0.0a\crypto\dso;..\..\openssl-1.0.0a\crypto\ec;..\..\openssl-1.0.0a\crypto\ecdh;..\..\openssl-1.0.0a\crypto\ecdsa;..\..\openssl-1.0.0a\crypto\engine;..\..\openssl-1.0.0a\crypto\err;..\..\openssl-1.0.0a\crypto\evp;..\..\openssl-1.0.0a\ms;..\..\openssl-1.0.0a;%(AdditionalIncludeDirectories) 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;%(PreprocessorDefinitions) true - MultiThreadedDLL + MultiThreadedDebugDLL true @@ -127,12 +127,12 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\e_os.h" xcopy "$ /Gs0 %(AdditionalOptions) - Full + Disabled AnySuitable ..\..\openssl-1.0.0a\include;..\..\openssl-1.0.0a\crypto;..\..\openssl-1.0.0a\crypto\aes;..\..\openssl-1.0.0a\crypto\asn1;..\..\openssl-1.0.0a\crypto\bf;..\..\openssl-1.0.0a\crypto\bio;..\..\openssl-1.0.0a\crypto\bn;..\..\openssl-1.0.0a\crypto\buffer;..\..\openssl-1.0.0a\crypto\camellia;..\..\openssl-1.0.0a\crypto\cast;..\..\openssl-1.0.0a\crypto\cms;..\..\openssl-1.0.0a\crypto\comp;..\..\openssl-1.0.0a\crypto\conf;..\..\openssl-1.0.0a\crypto\des;..\..\openssl-1.0.0a\crypto\dh;..\..\openssl-1.0.0a\crypto\dsa;..\..\openssl-1.0.0a\crypto\dso;..\..\openssl-1.0.0a\crypto\ec;..\..\openssl-1.0.0a\crypto\ecdh;..\..\openssl-1.0.0a\crypto\ecdsa;..\..\openssl-1.0.0a\crypto\engine;..\..\openssl-1.0.0a\crypto\err;..\..\openssl-1.0.0a\crypto\evp;..\..\openssl-1.0.0a\ms;..\..\openssl-1.0.0a;%(AdditionalIncludeDirectories) 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;%(PreprocessorDefinitions) true - MultiThreadedDLL + MultiThreadedDebugDLL true diff --git a/libs/win32/openssl/libeay32.2012.vcxproj b/libs/win32/openssl/libeay32.2012.vcxproj index 8bc2a07f1c..906f9e7c60 100644 --- 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.0a\include\openssl\e_os.h" xcopy "$ /Gs0 %(AdditionalOptions) - Full + Disabled AnySuitable ..\..\openssl-1.0.0a\include;..\..\openssl-1.0.0a\crypto;..\..\openssl-1.0.0a\crypto\aes;..\..\openssl-1.0.0a\crypto\asn1;..\..\openssl-1.0.0a\crypto\bf;..\..\openssl-1.0.0a\crypto\bio;..\..\openssl-1.0.0a\crypto\bn;..\..\openssl-1.0.0a\crypto\buffer;..\..\openssl-1.0.0a\crypto\camellia;..\..\openssl-1.0.0a\crypto\cast;..\..\openssl-1.0.0a\crypto\cms;..\..\openssl-1.0.0a\crypto\comp;..\..\openssl-1.0.0a\crypto\conf;..\..\openssl-1.0.0a\crypto\des;..\..\openssl-1.0.0a\crypto\dh;..\..\openssl-1.0.0a\crypto\dsa;..\..\openssl-1.0.0a\crypto\dso;..\..\openssl-1.0.0a\crypto\ec;..\..\openssl-1.0.0a\crypto\ecdh;..\..\openssl-1.0.0a\crypto\ecdsa;..\..\openssl-1.0.0a\crypto\engine;..\..\openssl-1.0.0a\crypto\err;..\..\openssl-1.0.0a\crypto\evp;..\..\openssl-1.0.0a\ms;..\..\openssl-1.0.0a;%(AdditionalIncludeDirectories) 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;%(PreprocessorDefinitions) true - MultiThreadedDLL + MultiThreadedDebugDLL true @@ -131,12 +131,12 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\e_os.h" xcopy "$ /Gs0 %(AdditionalOptions) - Full + Disabled AnySuitable ..\..\openssl-1.0.0a\include;..\..\openssl-1.0.0a\crypto;..\..\openssl-1.0.0a\crypto\aes;..\..\openssl-1.0.0a\crypto\asn1;..\..\openssl-1.0.0a\crypto\bf;..\..\openssl-1.0.0a\crypto\bio;..\..\openssl-1.0.0a\crypto\bn;..\..\openssl-1.0.0a\crypto\buffer;..\..\openssl-1.0.0a\crypto\camellia;..\..\openssl-1.0.0a\crypto\cast;..\..\openssl-1.0.0a\crypto\cms;..\..\openssl-1.0.0a\crypto\comp;..\..\openssl-1.0.0a\crypto\conf;..\..\openssl-1.0.0a\crypto\des;..\..\openssl-1.0.0a\crypto\dh;..\..\openssl-1.0.0a\crypto\dsa;..\..\openssl-1.0.0a\crypto\dso;..\..\openssl-1.0.0a\crypto\ec;..\..\openssl-1.0.0a\crypto\ecdh;..\..\openssl-1.0.0a\crypto\ecdsa;..\..\openssl-1.0.0a\crypto\engine;..\..\openssl-1.0.0a\crypto\err;..\..\openssl-1.0.0a\crypto\evp;..\..\openssl-1.0.0a\ms;..\..\openssl-1.0.0a;%(AdditionalIncludeDirectories) 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;%(PreprocessorDefinitions) true - MultiThreadedDLL + MultiThreadedDebugDLL true diff --git a/libs/win32/openssl/openssl.2010.vcxproj b/libs/win32/openssl/openssl.2010.vcxproj index b2fe7e2d24..1c1044bd0a 100644 --- a/libs/win32/openssl/openssl.2010.vcxproj +++ b/libs/win32/openssl/openssl.2010.vcxproj @@ -80,7 +80,7 @@ true true Default - MultiThreadedDLL + MultiThreadedDebugDLL true @@ -140,7 +140,7 @@ true true Default - MultiThreadedDLL + MultiThreadedDebugDLL true diff --git a/libs/win32/openssl/openssl.2012.vcxproj b/libs/win32/openssl/openssl.2012.vcxproj index 1b06c989d1..000cd4cf90 100644 --- a/libs/win32/openssl/openssl.2012.vcxproj +++ b/libs/win32/openssl/openssl.2012.vcxproj @@ -84,7 +84,7 @@ true true Default - MultiThreadedDLL + MultiThreadedDebugDLL true @@ -144,7 +144,7 @@ true true Default - MultiThreadedDLL + MultiThreadedDebugDLL true diff --git a/libs/win32/openssl/ssleay32.2010.vcxproj b/libs/win32/openssl/ssleay32.2010.vcxproj index 5312abe2f0..6f87a08f92 100644 --- a/libs/win32/openssl/ssleay32.2010.vcxproj +++ b/libs/win32/openssl/ssleay32.2010.vcxproj @@ -84,12 +84,12 @@ /Gs0 %(AdditionalOptions) - MaxSpeed + Disabled AnySuitable ..\..\openssl-1.0.0a\include;..\..\openssl-1.0.0a\crypto;..\..\openssl-1.0.0a;%(AdditionalIncludeDirectories) 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;%(PreprocessorDefinitions) true - MultiThreadedDLL + MultiThreadedDebugDLL true @@ -141,12 +141,12 @@ /Gs0 %(AdditionalOptions) - MaxSpeed + Disabled AnySuitable ..\..\openssl-1.0.0a\include;..\..\openssl-1.0.0a\crypto;..\..\openssl-1.0.0a;%(AdditionalIncludeDirectories) 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;%(PreprocessorDefinitions) true - MultiThreadedDLL + MultiThreadedDebugDLL true diff --git a/libs/win32/openssl/ssleay32.2012.vcxproj b/libs/win32/openssl/ssleay32.2012.vcxproj index 9d94a068d8..b90006a1ce 100644 --- a/libs/win32/openssl/ssleay32.2012.vcxproj +++ b/libs/win32/openssl/ssleay32.2012.vcxproj @@ -93,7 +93,7 @@ ..\..\openssl-1.0.0a\include;..\..\openssl-1.0.0a\crypto;..\..\openssl-1.0.0a;%(AdditionalIncludeDirectories) 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;%(PreprocessorDefinitions) true - MultiThreadedDLL + MultiThreadedDebugDLL true @@ -150,7 +150,7 @@ ..\..\openssl-1.0.0a\include;..\..\openssl-1.0.0a\crypto;..\..\openssl-1.0.0a;%(AdditionalIncludeDirectories) 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;%(PreprocessorDefinitions) true - MultiThreadedDLL + MultiThreadedDebugDLL true