Skip to content

F
freeswitch
提交 583c96af authored 作者: Stefan Knoblich's avatar Stefan Knoblich
浏览文件
操作

Merge branch 'master' of ssh://git.freeswitch.org/freeswitch

上级 b9391cff 1627f6a5
隐藏空白字符变更
内嵌 并排
正在显示 包含 19 行增加 和 34 行删除
libs/win32/openssl/libeay32.2008.vcproj
浏览文件 @ 583c96af
......@@ -32,7 +32,7 @@
>
<Tool
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\e_os.h&quot; xcopy &quot;$(ProjectDir)\include\*.*&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\&quot; /C /Y /S&#x0D;&#x0A;"
CommandLine="copy /Y &quot;$(ProjectDir)opensslconf.h&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h&quot;&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)applink.c&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c&quot;&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)buildinf.h&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h&quot;&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)libeay32.def&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\libeay32.def&quot;&#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
Name="VCCustomBuildTool"
......@@ -116,7 +116,7 @@
>
<Tool
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\e_os.h&quot; xcopy &quot;$(ProjectDir)\include\*.*&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\&quot; /C /Y /S&#x0D;&#x0A;"
CommandLine="copy /Y &quot;$(ProjectDir)opensslconf.h&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h&quot;&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)applink.c&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c&quot;&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)buildinf.h&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h&quot;&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)libeay32.def&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\libeay32.def&quot;&#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
Name="VCCustomBuildTool"
......@@ -201,7 +201,7 @@
>
<Tool
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\e_os.h&quot; xcopy &quot;$(ProjectDir)\include\*.*&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\&quot; /C /Y /S&#x0D;&#x0A;"
CommandLine="copy /Y &quot;$(ProjectDir)opensslconf.h&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h&quot;&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)applink.c&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c&quot;&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)buildinf.h&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h&quot;&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)libeay32.def&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\libeay32.def&quot;&#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
Name="VCCustomBuildTool"
......@@ -286,7 +286,7 @@
>
<Tool
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\e_os.h&quot; xcopy &quot;$(ProjectDir)\include\*.*&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\&quot; /C /Y /S&#x0D;&#x0A;"
CommandLine="copy /Y &quot;$(ProjectDir)opensslconf.h&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h&quot;&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)applink.c&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c&quot;&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)buildinf.h&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h&quot;&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)libeay32.def&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\libeay32.def&quot;&#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
Name="VCCustomBuildTool"
......
libs/win32/openssl/libeay32.2010.vcxproj
浏览文件 @ 583c96af
......@@ -81,10 +81,10 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
<Command>copy /Y $(ProjectDir)opensslconf.h $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h
copy /Y $(ProjectDir)applink.c $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c
copy /Y $(ProjectDir)buildinf.h $(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h
copy /Y $(ProjectDir)libeay32.def $(ProjectDir)..\..\openssl-1.0.0a\libeay32.def
<Command>copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h"
copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c"
copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h"
copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.0a\libeay32.def"
if not exist "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\" /C /Y /S
</Command>
</PreBuildEvent>
......@@ -115,12 +115,7 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\e_os.h" xcopy "$
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
<Command>copy /Y $(ProjectDir)opensslconf.h $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h
copy /Y $(ProjectDir)applink.c $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c
copy /Y $(ProjectDir)buildinf.h $(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h
copy /Y $(ProjectDir)libeay32.def $(ProjectDir)..\..\openssl-1.0.0a\libeay32.def
if not exist "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\" /C /Y /S
</Command>
<Command>copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h"</Command>
</PreBuildEvent>
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
......@@ -151,12 +146,7 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\e_os.h" xcopy "$
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Command>copy /Y $(ProjectDir)opensslconf.h $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h
copy /Y $(ProjectDir)applink.c $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c
copy /Y $(ProjectDir)buildinf.h $(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h
copy /Y $(ProjectDir)libeay32.def $(ProjectDir)..\..\openssl-1.0.0a\libeay32.def
if not exist "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\" /C /Y /S
</Command>
<Command>copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h"</Command>
</PreBuildEvent>
<ClCompile>
<AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>
......@@ -185,12 +175,7 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\e_os.h" xcopy "$
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
<Command>copy /Y $(ProjectDir)opensslconf.h $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h
copy /Y $(ProjectDir)applink.c $(ProjectDir)..\..\openssl-1.0.0a\include\openssl\applink.c
copy /Y $(ProjectDir)buildinf.h $(ProjectDir)..\..\openssl-1.0.0a\crypto\buildinf.h
copy /Y $(ProjectDir)libeay32.def $(ProjectDir)..\..\openssl-1.0.0a\libeay32.def
if not exist "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\" /C /Y /S
</Command>
<Command>copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.0a\include\openssl\opensslconf.h"</Command>
</PreBuildEvent>
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
......
libs/win32/openssl/ssleay32.2008.vcproj
浏览文件 @ 583c96af
......@@ -29,7 +29,7 @@
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="copy /Y $(ProjectDir)ssleay32.def $(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def"
CommandLine="copy /Y &quot;$(ProjectDir)ssleay32.def&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def&quot;"
/>
<Tool
Name="VCCustomBuildTool"
......@@ -108,7 +108,7 @@
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="copy /Y $(ProjectDir)ssleay32.def $(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def"
CommandLine="copy /Y &quot;$(ProjectDir)ssleay32.def&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def&quot;"
/>
<Tool
Name="VCCustomBuildTool"
......@@ -188,7 +188,7 @@
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="copy /Y $(ProjectDir)ssleay32.def $(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def"
CommandLine="copy /Y &quot;$(ProjectDir)ssleay32.def&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def&quot;"
/>
<Tool
Name="VCCustomBuildTool"
......@@ -268,7 +268,7 @@
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="copy /Y $(ProjectDir)ssleay32.def $(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def"
CommandLine="copy /Y &quot;$(ProjectDir)ssleay32.def&quot; &quot;$(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def&quot;"
/>
<Tool
Name="VCCustomBuildTool"
......
libs/win32/openssl/ssleay32.2010.vcxproj
浏览文件 @ 583c96af
......@@ -80,7 +80,7 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
<Command>copy /Y $(ProjectDir)ssleay32.def $(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def</Command>
<Command>copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def"</Command>
</PreBuildEvent>
<ClCompile>
<AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>
......@@ -107,7 +107,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Command>copy /Y $(ProjectDir)ssleay32.def $(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def</Command>
<Command>copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def"</Command>
</PreBuildEvent>
<ClCompile>
<AdditionalOptions>/Gs0 %(AdditionalOptions)</AdditionalOptions>
......@@ -134,7 +134,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
<Command>copy /Y $(ProjectDir)ssleay32.def $(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def</Command>
<Command>copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def"</Command>
</PreBuildEvent>
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
......@@ -164,7 +164,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
<Command>copy /Y $(ProjectDir)ssleay32.def $(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def</Command>
<Command>copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.0a\ssleay32.def"</Command>
</PreBuildEvent>
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论