bump rev to upstream r1401

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16719 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Brian West committed 2010-02-22 15:43:43 +00:00
1 parent 12093e9913
commit c7b05ea27c
147 files changed
+5512 -901

No files matched your search

-4
View File
@@ -9,10 +9,6 @@
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""$(AprDir)\include";"$(AprUtilDir)\include""
/>
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories="&quot;$(AprDir)\$(ConfigurationName)&quot;;&quot;$(AprUtilDir)\$(ConfigurationName)&quot;"
/>
<UserMacro
Name="AprDir"
Value="$(LibRootDir)libs\apr"
-4
View File
@@ -10,8 +10,4 @@
AdditionalIncludeDirectories="&quot;$(ProjectRootDir)libs\apr-toolkit\include&quot;"
PreprocessorDefinitions="APT_STATIC_LIB"
/>
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
/>
</VisualStudioPropertySheet>
-4
View File
@@ -10,8 +10,4 @@
AdditionalIncludeDirectories="&quot;$(ProjectRootDir)libs\mpf\include&quot;"
PreprocessorDefinitions="MPF_STATIC_LIB"
/>
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
/>
</VisualStudioPropertySheet>
-4
View File
@@ -10,8 +10,4 @@
AdditionalIncludeDirectories="&quot;$(ProjectRootDir)libs\mrcp\include&quot;;&quot;$(ProjectRootDir)libs\mrcp\message\include&quot;;&quot;$(ProjectRootDir)libs\mrcp\control\include&quot;;&quot;$(ProjectRootDir)libs\mrcp\resources\include&quot;"
PreprocessorDefinitions="MRCP_STATIC_LIB"
/>
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
/>
</VisualStudioPropertySheet>
@@ -9,8 +9,4 @@
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(ProjectRootDir)libs\mrcp-client\include&quot;"
/>
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
/>
</VisualStudioPropertySheet>
@@ -9,8 +9,4 @@
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(ProjectRootDir)libs\mrcp-engine\include&quot;"
/>
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
/>
</VisualStudioPropertySheet>
@@ -9,8 +9,4 @@
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(ProjectRootDir)libs\mrcp-server\include&quot;"
/>
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
/>
</VisualStudioPropertySheet>
@@ -9,8 +9,4 @@
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(ProjectRootDir)libs\mrcp-signaling\include&quot;"
/>
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
/>
</VisualStudioPropertySheet>
@@ -9,8 +9,4 @@
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(ProjectRootDir)libs\mrcpv2-transport\include&quot;"
/>
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
/>
</VisualStudioPropertySheet>
@@ -9,10 +9,6 @@
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(SofiaDir)\win32&quot;;&quot;$(SofiaDir)\libsofia-sip-ua\su&quot;;&quot;$(SofiaDir)\libsofia-sip-ua\nua&quot;;&quot;$(SofiaDir)\libsofia-sip-ua\url&quot;;&quot;$(SofiaDir)\libsofia-sip-ua\sip&quot;;&quot;$(SofiaDir)\libsofia-sip-ua\msg&quot;;&quot;$(SofiaDir)\libsofia-sip-ua\sdp&quot;;&quot;$(SofiaDir)\libsofia-sip-ua\nta&quot;;&quot;$(SofiaDir)\libsofia-sip-ua\nea&quot;;&quot;$(SofiaDir)\libsofia-sip-ua\soa&quot;;&quot;$(SofiaDir)\libsofia-sip-ua\iptsec&quot;;&quot;$(SofiaDir)\libsofia-sip-ua\bnf&quot;;&quot;$(SofiaDir)\libsofia-sip-ua\features&quot;"
/>
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories="&quot;$(SofiaDir)\win32\libsofia-sip-ua\$(ConfigurationName)&quot;"
/>
<UserMacro
Name="SofiaDir"
Value="$(LibRootDir)libs\sofia-sip"
@@ -3,8 +3,6 @@
ProjectType="Visual C++"
Version="8.00"
Name="unibase"
OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"
IntermediateDirectory="$(ConfigurationName)"
>
<Tool
Name="VCCLCompilerTool"
@@ -13,10 +11,6 @@
WarnAsError="true"
DisableSpecificWarnings="4100"
/>
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
/>
<UserMacro
Name="ProjectRootDir"
Value="$(ProjectDir)..\..\"
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="windows-1251"?>
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
Name="unibin-x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\bin"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
InheritedPropertySheets="apr.vsprops;sofiasip.vsprops"
>
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories="$(AprDir)\$(PlatformName)\$(ConfigurationName);$(AprUtilDir)\$(PlatformName)\$(ConfigurationName);$(SofiaDir)\win32\libsofia-sip-ua\$(PlatformName)\$(ConfigurationName);$(SolutionDir)$(PlatformName)\$(ConfigurationName)\lib;$(SolutionDir)$(PlatformName)\$(ConfigurationName)\bin"
TargetMachine="17"
/>
</VisualStudioPropertySheet>
+15
View File
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="windows-1251"?>
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
Name="unibin"
OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"
IntermediateDirectory="$(ConfigurationName)"
InheritedPropertySheets="apr.vsprops;sofiasip.vsprops"
>
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories="$(AprDir)\$(ConfigurationName);$(AprUtilDir)\$(ConfigurationName);$(SofiaDir)\win32\libsofia-sip-ua\$(ConfigurationName);$(SolutionDir)$(ConfigurationName)\lib;$(SolutionDir)$(ConfigurationName)\bin"
TargetMachine="1"
/>
</VisualStudioPropertySheet>
+1 -2
View File
@@ -13,12 +13,11 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
DebugInformationFormat="4"
DebugInformationFormat="3"
/>
<Tool
Name="VCLinkerTool"
LinkIncremental="2"
GenerateDebugInformation="true"
TargetMachine="1"
/>
</VisualStudioPropertySheet>
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="windows-1251"?>
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
Name="unilib-x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\lib"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
>
<Tool
Name="VCLinkerTool"
TargetMachine="17"
/>
</VisualStudioPropertySheet>
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="windows-1251"?>
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
Name="unilib"
OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib"
IntermediateDirectory="$(ConfigurationName)"
>
<Tool
Name="VCLinkerTool"
TargetMachine="1"
/>
</VisualStudioPropertySheet>
@@ -9,10 +9,6 @@
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(ProjectRootDir)platforms\libunimrcp-client\include&quot;;&quot;$(ProjectRootDir)build&quot;"
/>
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
/>
<UserMacro
Name="UniMRCPClientLibs"
Value="libunimrcpclient.lib mrcpclient.lib mrcpsignaling.lib mrcp.lib aprtoolkit.lib libaprutil-1.lib libapr-1.lib libsofia_sip_ua.lib ws2_32.lib winmm.lib"
@@ -9,10 +9,6 @@
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(ProjectRootDir)platforms\libunimrcp-server\include&quot;;&quot;$(ProjectRootDir)build&quot;"
/>
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
/>
<UserMacro
Name="UniMRCPServerLibs"
Value="libunimrcpserver.lib mrcpserver.lib mrcpsignaling.lib mrcpengine.lib mrcp.lib aprtoolkit.lib libaprutil-1.lib libapr-1.lib libsofia_sip_ua.lib ws2_32.lib winmm.lib"
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="windows-1251"?>
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
Name="uniplugin-x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\plugin"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
InheritedPropertySheets="apr.vsprops;mrcpengine.vsprops"
>
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories="$(AprDir)\$(PlatformName)\$(ConfigurationName);$(AprUtilDir)\$(PlatformName)\$(ConfigurationName);$(SolutionDir)$(PlatformName)\$(ConfigurationName)\lib"
AdditionalDependencies="mrcpengine.lib mrcp.lib mpf.lib aprtoolkit.lib libaprutil-1.lib libapr-1.lib ws2_32.lib"
TargetMachine="17"
/>
</VisualStudioPropertySheet>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="windows-1251"?>
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
Name="uniplugin"
OutputDirectory="$(SolutionDir)$(ConfigurationName)\plugin"
IntermediateDirectory="$(ConfigurationName)"
InheritedPropertySheets="apr.vsprops;mrcpengine.vsprops"
>
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories="$(AprDir)\$(ConfigurationName);$(AprUtilDir)\$(ConfigurationName);$(SolutionDir)$(ConfigurationName)\lib"
AdditionalDependencies="mrcpengine.lib mrcp.lib mpf.lib aprtoolkit.lib libaprutil-1.lib libapr-1.lib ws2_32.lib"
TargetMachine="1"
/>
</VisualStudioPropertySheet>
@@ -10,8 +10,4 @@
AdditionalIncludeDirectories="&quot;$(ProjectRootDir)libs\uni-rtsp\include&quot;"
PreprocessorDefinitions="RTSP_STATIC_LIB"
/>
<Tool
Name="VCLinkerTool"
AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
/>
</VisualStudioPropertySheet>