remove jrtp from windows build system

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1031 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2006-04-04 05:18:18 +00:00
parent 6354ac9987
commit e72bbb118b
3 changed files with 8 additions and 40 deletions

View File

@ -65,10 +65,10 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/NODEFAULTLIB:LIMBCTD"
AdditionalDependencies="libdingaling.lib Ws2_32.lib jrtplib.lib iksemel.lib "
AdditionalDependencies="libdingaling.lib Ws2_32.lib iksemel.lib"
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_dingaling.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\libdingaling\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\w32\vsnet\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\libs\jrtplib\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\libs\iksemel\$(OutDir)&quot;"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\libdingaling\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\w32\vsnet\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\libs\iksemel\$(OutDir)&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/mod_dingaling.pdb"
SubSystem="2"
@ -146,10 +146,10 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libdingaling.lib Ws2_32.lib jrtplib.lib iksemel.lib "
AdditionalDependencies="libdingaling.lib Ws2_32.lib iksemel.lib"
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_dingaling.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\libdingaling\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\w32\vsnet\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\libs\jrtplib\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\libs\iksemel\$(OutDir)&quot;"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\libdingaling\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\w32\vsnet\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\libs\iksemel\$(OutDir)&quot;"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"

View File

@ -43,7 +43,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/D _CRT_SECURE_NO_DEPRECATE"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libs\include;..\..\..\..\libs\libeXosip2\include;..\..\..\..\libs\osip\include;..\..\..\..\libs\jrtp4c\src;..\..\..\..\libs\osip\src\osipparser2;..\..\..\..\libs\jrtplib\src;&quot;..\..\..\..\libs\jthread-1.1.2\src&quot;;."
AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libs\include;..\..\..\..\libs\libeXosip2\include;..\..\..\..\libs\osip\include;..\..\..\..\libs\osip\src\osipparser2;."
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
GeneratePreprocessedFile="0"
MinimalRebuild="true"
@ -67,7 +67,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/NODEFAULTLIB:LIBCMT"
AdditionalDependencies="Ws2_32.lib Iphlpapi.lib libcpmt.lib eXosip.lib jrtplib.lib osipparser2.lib osip2.lib"
AdditionalDependencies="Ws2_32.lib Iphlpapi.lib libcpmt.lib eXosip.lib osipparser2.lib osip2.lib"
ShowProgress="0"
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_exosip.dll"
LinkIncremental="2"
@ -131,7 +131,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libs\include;..\..\..\..\libs\libeXosip2\include;..\..\..\..\libs\osip\include;..\..\..\..\libs\jrtp4c\src;..\..\..\..\libs\osip\src\osipparser2;..\..\..\..\libs\jrtplib\src;&quot;..\..\..\..\libs\jthread-1.1.2\src&quot;;."
AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libs\include;..\..\..\..\libs\libeXosip2\include;..\..\..\..\libs\osip\include;..\..\..\..\libs\osip\src\osipparser2;."
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
@ -151,7 +151,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Ws2_32.lib Iphlpapi.lib libcpmt.lib eXosip.lib jrtplib.lib osipparser2.lib osip2.lib"
AdditionalDependencies="Ws2_32.lib Iphlpapi.lib libcpmt.lib eXosip.lib osipparser2.lib osip2.lib"
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_exosip.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\libeXosip2\platform\vsnet\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\libs\osip\platform\vsnet\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\w32\vsnet\$(OutDir)&quot;"

View File

@ -174,21 +174,11 @@ End If
If BuildModExosip Then
BuildLibs_libosip2 BuildDebug, BuildRelease
BuildLibs_exosip BuildDebug, BuildRelease
BuildLibs_jrtplib BuildDebug, BuildRelease
If Not FSO.FolderExists(LibDestDir & "include\jrtplib3") Then
FSO.CreateFolder(LibDestDir & "include\jrtplib3")
End If
FSO.CopyFile LibDestDir & "jrtplib\src\*.h", LibDestDir & "include\jrtplib3"
End If
If BuildModDingaling Then
BuildLibs_iksemel BuildDebug, BuildRelease
BuildLibs_jrtplib BuildDebug, BuildRelease
If Not FSO.FolderExists(LibDestDir & "include\jrtplib3") Then
FSO.CreateFolder(LibDestDir & "include\jrtplib3")
End If
FSO.CopyFile LibDestDir & "jrtplib\src\*.h", LibDestDir & "include\jrtplib3"
BuildLibs_libdingaling BuildDebug, BuildRelease
End If
If BuildModIaxChan Then
@ -410,28 +400,6 @@ Sub BuildLibs_srtp(BuildDebug, BuildRelease)
End If
End Sub
Sub BuildLibs_jrtplib(BuildDebug, BuildRelease)
If FSO.FolderExists(LibDestDir & "jrtplib")Then
If BuildDebug Then
If (Not FSO.FileExists(LibDestDir & "jrtplib\Debug Dll\jrtplib.lib")) Then
BuildViaVCBuild LibDestDir & "jrtplib\jrtplib.vcproj", "Debug Dll"
FSO.CopyFile LibDestDir & "jrtplib\Debug Dll\jrtplib.dll", ScriptDir & "Debug\", True
FSO.CopyFile LibDestDir & "jrtplib\Debug Dll\jrtplib.lib", ScriptDir & "Debug\", True
End If
End If
If BuildRelease Then
If (Not FSO.FileExists(LibDestDir & "jrtplib\Release Dll\jrtplib.lib")) Then
BuildViaVCBuild LibDestDir & "jrtplib\jrtplib.vcproj", "Release Dll"
FSO.CopyFile LibDestDir & "jrtplib\Release Dll\jrtplib.dll", ScriptDir & "Release\", True
FSO.CopyFile LibDestDir & "jrtplib\Release Dll\jrtplib.lib", ScriptDir & "Release\", True
End If
End If
Else
Wscript.echo "Unable to download JRtplib"
End If
End Sub
Sub BuildLibs_sqlite(BuildDebug, BuildRelease)
If Not FSO.FolderExists(LibDestDir & "sqlite") Then
WgetUnCompress "http://www.sqlite.org/sqlite-source-3_2_7.zip", LibDestDir