remove jrtp from windows build system

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1031 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/endpoints/mod_dingaling/mod_dingaling.vcproj b/src/mod/endpoints/mod_dingaling/mod_dingaling.vcproj
index fb33eab5bb5132d2edcb7ec7710d89db055e7218..177276a33e28a49e2218aaa360aebe5e7f47f8ee 100644 (file)
--- a/src/mod/endpoints/mod_dingaling/mod_dingaling.vcproj
+++ b/src/mod/endpoints/mod_dingaling/mod_dingaling.vcproj
@@ -65,10 +65,10 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions="/NODEFAULTLIB:LIMBCTD"\r
-                               AdditionalDependencies="libdingaling.lib Ws2_32.lib jrtplib.lib iksemel.lib "\r
+                               AdditionalDependencies="libdingaling.lib Ws2_32.lib iksemel.lib"\r
                                OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_dingaling.dll"\r
                                LinkIncremental="2"\r
-                               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;"\r
+                               AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\libdingaling\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\w32\vsnet\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\libs\iksemel\$(OutDir)&quot;"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/mod_dingaling.pdb"\r
                                SubSystem="2"\r
@@ -146,10 +146,10 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="libdingaling.lib Ws2_32.lib jrtplib.lib iksemel.lib "\r
+                               AdditionalDependencies="libdingaling.lib Ws2_32.lib iksemel.lib"\r
                                OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_dingaling.dll"\r
                                LinkIncremental="1"\r
-                               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;"\r
+                               AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\libdingaling\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\w32\vsnet\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\libs\iksemel\$(OutDir)&quot;"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r

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

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