提交 d26ddd55 authored 作者: Jeff Lenk's avatar Jeff Lenk

MODSOFIA-92 fix build

上级 9ad509c2
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
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;" 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;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
...@@ -107,17 +107,16 @@ ...@@ -107,17 +107,16 @@
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Debug|x64"
OutputDirectory="$(SolutionDir)$(ConfigurationName)" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="1" CharacterSet="1"
ManagedExtensions="0" ManagedExtensions="0"
WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
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;" 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;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
...@@ -133,6 +132,7 @@ ...@@ -133,6 +132,7 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TargetEnvironment="3"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
...@@ -140,13 +140,12 @@ ...@@ -140,13 +140,12 @@
Optimization="3" Optimization="3"
InlineFunctionExpansion="2" InlineFunctionExpansion="2"
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;" 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;"
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" 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"
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
WarnAsError="true"
DebugInformationFormat="3" DebugInformationFormat="3"
DisableSpecificWarnings="4996" DisableSpecificWarnings="4996"
EnablePREfast="false" EnablePREfast="false"
...@@ -167,7 +166,7 @@ ...@@ -167,7 +166,7 @@
ModuleDefinitionFile="$(ProjectDir)..\..\openssl-1.0.0a\libeay32.def" ModuleDefinitionFile="$(ProjectDir)..\..\openssl-1.0.0a\libeay32.def"
GenerateDebugInformation="true" GenerateDebugInformation="true"
AssemblyDebug="1" AssemblyDebug="1"
TargetMachine="1" TargetMachine="17"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -192,16 +191,17 @@ ...@@ -192,16 +191,17 @@
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="1" CharacterSet="1"
ManagedExtensions="0" ManagedExtensions="0"
WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
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" 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;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
...@@ -217,7 +217,6 @@ ...@@ -217,7 +217,6 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TargetEnvironment="3"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
...@@ -225,12 +224,13 @@ ...@@ -225,12 +224,13 @@
Optimization="3" Optimization="3"
InlineFunctionExpansion="2" InlineFunctionExpansion="2"
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;" 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;"
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" 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"
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
WarnAsError="true"
DebugInformationFormat="3" DebugInformationFormat="3"
DisableSpecificWarnings="4996" DisableSpecificWarnings="4996"
EnablePREfast="false" EnablePREfast="false"
...@@ -251,7 +251,7 @@ ...@@ -251,7 +251,7 @@
ModuleDefinitionFile="$(ProjectDir)..\..\openssl-1.0.0a\libeay32.def" ModuleDefinitionFile="$(ProjectDir)..\..\openssl-1.0.0a\libeay32.def"
GenerateDebugInformation="true" GenerateDebugInformation="true"
AssemblyDebug="1" AssemblyDebug="1"
TargetMachine="17" TargetMachine="1"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -286,7 +286,7 @@ ...@@ -286,7 +286,7 @@
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
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;" 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;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论