MODSOFIA-92 fix build

diff --git a/libs/win32/openssl/libeay32.2008.vcproj b/libs/win32/openssl/libeay32.2008.vcproj
index d75eb5fab5e7210985b51001a7146df605f9b813..7edc1a9fa52b5bdfc4421556c93fe21e1cd7a3e0 100644 (file)
--- a/libs/win32/openssl/libeay32.2008.vcproj
+++ b/libs/win32/openssl/libeay32.2008.vcproj
@@ -32,7 +32,7 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="copy /Y $(ProjectDir)opensslconf.h $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h&#x0D;&#x0A;copy /Y $(ProjectDir)applink.c $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c&#x0D;&#x0A;copy /Y $(ProjectDir)buildinf.h $(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h&#x0D;&#x0A;copy /Y $(ProjectDir)libeay32.def $(ProjectDir)..\..\openssl-1.0.0a\libeay32.def&#x0D;&#x0A;"\r
+                               CommandLine="copy /Y $(ProjectDir)opensslconf.h $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h&#x0D;&#x0A;copy /Y $(ProjectDir)applink.c $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c&#x0D;&#x0A;copy /Y $(ProjectDir)buildinf.h $(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h&#x0D;&#x0A;copy /Y $(ProjectDir)libeay32.def $(ProjectDir)..\..\openssl-1.0.0a\libeay32.def&#x0D;&#x0A;if not exist &quot; $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\e_os.h&quot; xcopy &quot;$(ProjectDir)\include\*.*&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\&quot; /C /Y /S&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -107,17 +107,16 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        CharacterSet="1"\r
                        ManagedExtensions="0"\r
-                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="copy /Y $(ProjectDir)opensslconf.h $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h&#x0D;&#x0A;copy /Y $(ProjectDir)applink.c $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c&#x0D;&#x0A;copy /Y $(ProjectDir)buildinf.h $(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h&#x0D;&#x0A;copy /Y $(ProjectDir)libeay32.def $(ProjectDir)..\..\openssl-1.0.0a\libeay32.def&#x0D;&#x0A;"\r
+                               CommandLine="copy /Y $(ProjectDir)opensslconf.h $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h&#x0D;&#x0A;copy /Y $(ProjectDir)applink.c $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c&#x0D;&#x0A;copy /Y $(ProjectDir)buildinf.h $(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h&#x0D;&#x0A;copy /Y $(ProjectDir)libeay32.def $(ProjectDir)..\..\openssl-1.0.0a\libeay32.def&#x0D;&#x0A;if not exist &quot; $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\e_os.h&quot; xcopy &quot;$(ProjectDir)\include\*.*&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\&quot; /C /Y /S&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -133,6 +132,7 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
@@ -140,13 +140,12 @@
                                Optimization="3"\r
                                InlineFunctionExpansion="2"\r
                                AdditionalIncludeDirectories="&quot;..\..\openssl-1.0.0a\include&quot;;&quot;..\..\openssl-1.0.0a\crypto&quot;;&quot;..\..\openssl-1.0.0a\crypto\aes&quot;;&quot;..\..\openssl-1.0.0a\crypto\asn1&quot;;&quot;..\..\openssl-1.0.0a\crypto\bf&quot;;&quot;..\..\openssl-1.0.0a\crypto\bio&quot;;&quot;..\..\openssl-1.0.0a\crypto\bn&quot;;&quot;..\..\openssl-1.0.0a\crypto\buffer&quot;;&quot;..\..\openssl-1.0.0a\crypto\camellia&quot;;&quot;..\..\openssl-1.0.0a\crypto\cast&quot;;&quot;..\..\openssl-1.0.0a\crypto\cms&quot;;&quot;..\..\openssl-1.0.0a\crypto\comp&quot;;&quot;..\..\openssl-1.0.0a\crypto\conf&quot;;&quot;..\..\openssl-1.0.0a\crypto\des&quot;;&quot;..\..\openssl-1.0.0a\crypto\dh&quot;;&quot;..\..\openssl-1.0.0a\crypto\dsa&quot;;&quot;..\..\openssl-1.0.0a\crypto\dso&quot;;&quot;..\..\openssl-1.0.0a\crypto\ec&quot;;&quot;..\..\openssl-1.0.0a\crypto\ecdh&quot;;&quot;..\..\openssl-1.0.0a\crypto\ecdsa&quot;;&quot;..\..\openssl-1.0.0a\crypto\engine&quot;;&quot;..\..\openssl-1.0.0a\crypto\err&quot;;&quot;..\..\openssl-1.0.0a\crypto\evp&quot;;&quot;..\..\openssl-1.0.0a\ms&quot;;&quot;..\..\openssl-1.0.0a&quot;"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CRT_NON_CONFORMING_SWPRINTFS;OPENSSL_THREADS;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;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"\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"\r
                                StringPooling="true"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               WarnAsError="true"\r
                                DebugInformationFormat="3"\r
                                DisableSpecificWarnings="4996"\r
                                EnablePREfast="false"\r
@@ -167,7 +166,7 @@
                                ModuleDefinitionFile="$(ProjectDir)..\..\openssl-1.0.0a\libeay32.def"\r
                                GenerateDebugInformation="true"\r
                                AssemblyDebug="1"\r
-                               TargetMachine="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -192,16 +191,17 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        CharacterSet="1"\r
                        ManagedExtensions="0"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="copy /Y $(ProjectDir)opensslconf.h $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h&#x0D;&#x0A;copy /Y $(ProjectDir)applink.c $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c&#x0D;&#x0A;copy /Y $(ProjectDir)buildinf.h $(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h&#x0D;&#x0A;copy /Y $(ProjectDir)libeay32.def $(ProjectDir)..\..\openssl-1.0.0a\libeay32.def&#x0D;&#x0A;if not exist &quot; $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\bio.h&quot; xcopy &quot;$(ProjectDir)\include\*.*&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\&quot; /C /D /Y /S"\r
+                               CommandLine="copy /Y $(ProjectDir)opensslconf.h $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h&#x0D;&#x0A;copy /Y $(ProjectDir)applink.c $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c&#x0D;&#x0A;copy /Y $(ProjectDir)buildinf.h $(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h&#x0D;&#x0A;copy /Y $(ProjectDir)libeay32.def $(ProjectDir)..\..\openssl-1.0.0a\libeay32.def&#x0D;&#x0A;if not exist &quot; $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\e_os.h&quot; xcopy &quot;$(ProjectDir)\include\*.*&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\&quot; /C /Y /S&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -217,7 +217,6 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
@@ -225,12 +224,13 @@
                                Optimization="3"\r
                                InlineFunctionExpansion="2"\r
                                AdditionalIncludeDirectories="&quot;..\..\openssl-1.0.0a\include&quot;;&quot;..\..\openssl-1.0.0a\crypto&quot;;&quot;..\..\openssl-1.0.0a\crypto\aes&quot;;&quot;..\..\openssl-1.0.0a\crypto\asn1&quot;;&quot;..\..\openssl-1.0.0a\crypto\bf&quot;;&quot;..\..\openssl-1.0.0a\crypto\bio&quot;;&quot;..\..\openssl-1.0.0a\crypto\bn&quot;;&quot;..\..\openssl-1.0.0a\crypto\buffer&quot;;&quot;..\..\openssl-1.0.0a\crypto\camellia&quot;;&quot;..\..\openssl-1.0.0a\crypto\cast&quot;;&quot;..\..\openssl-1.0.0a\crypto\cms&quot;;&quot;..\..\openssl-1.0.0a\crypto\comp&quot;;&quot;..\..\openssl-1.0.0a\crypto\conf&quot;;&quot;..\..\openssl-1.0.0a\crypto\des&quot;;&quot;..\..\openssl-1.0.0a\crypto\dh&quot;;&quot;..\..\openssl-1.0.0a\crypto\dsa&quot;;&quot;..\..\openssl-1.0.0a\crypto\dso&quot;;&quot;..\..\openssl-1.0.0a\crypto\ec&quot;;&quot;..\..\openssl-1.0.0a\crypto\ecdh&quot;;&quot;..\..\openssl-1.0.0a\crypto\ecdsa&quot;;&quot;..\..\openssl-1.0.0a\crypto\engine&quot;;&quot;..\..\openssl-1.0.0a\crypto\err&quot;;&quot;..\..\openssl-1.0.0a\crypto\evp&quot;;&quot;..\..\openssl-1.0.0a\ms&quot;;&quot;..\..\openssl-1.0.0a&quot;"\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"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CRT_NON_CONFORMING_SWPRINTFS;OPENSSL_THREADS;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;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"\r
                                StringPooling="true"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
+                               WarnAsError="true"\r
                                DebugInformationFormat="3"\r
                                DisableSpecificWarnings="4996"\r
                                EnablePREfast="false"\r
@@ -251,7 +251,7 @@
                                ModuleDefinitionFile="$(ProjectDir)..\..\openssl-1.0.0a\libeay32.def"\r
                                GenerateDebugInformation="true"\r
                                AssemblyDebug="1"\r
-                               TargetMachine="17"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -286,7 +286,7 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="copy /Y $(ProjectDir)opensslconf.h $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h&#x0D;&#x0A;copy /Y $(ProjectDir)applink.c $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c&#x0D;&#x0A;copy /Y $(ProjectDir)buildinf.h $(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h&#x0D;&#x0A;copy /Y $(ProjectDir)libeay32.def $(ProjectDir)..\..\openssl-1.0.0a\libeay32.def&#x0D;&#x0A;"\r
+                               CommandLine="copy /Y $(ProjectDir)opensslconf.h $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h&#x0D;&#x0A;copy /Y $(ProjectDir)applink.c $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c&#x0D;&#x0A;copy /Y $(ProjectDir)buildinf.h $(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h&#x0D;&#x0A;copy /Y $(ProjectDir)libeay32.def $(ProjectDir)..\..\openssl-1.0.0a\libeay32.def&#x0D;&#x0A;if not exist &quot; $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\e_os.h&quot; xcopy &quot;$(ProjectDir)\include\*.*&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\&quot; /C /Y /S&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r