diff --git a/w32/vsnet/GetLibs.vbs b/w32/vsnet/GetLibs.vbs
index 3ea990472e..375f92b9bf 100644
--- a/w32/vsnet/GetLibs.vbs
+++ b/w32/vsnet/GetLibs.vbs
@@ -114,13 +114,14 @@ End Sub
Sub BuildLibs_ModExosip(BuildDebug, BuildRelease)
If Not FSO.FolderExists(LibDestDir & "osip") Then
- WgetUnTarGz "http://www.antisip.com/download/libosip2-2.2.1.tar.gz", LibDestDir
- If Not FSO.FolderExists(LibDestDir & "libosip2-2.2.1") Then
+ WgetUnTarGz "http://www.antisip.com/download/libosip2-2.2.2.tar.gz", LibDestDir
+ If Not FSO.FolderExists(LibDestDir & "libosip2-2.2.2") Then
Wscript.echo "Unable to get osip from default download location, Trying backup location:"
- WgetUnTarGz "http://www.sofaswitch.org/mikej/libosip2-2.2.1.tar.gz", LibDestDir
+ WgetUnTarGz "http://www.sofaswitch.org/mikej/libosip2-2.2.2.tar.gz", LibDestDir
End If
- RenameFolder LibDestDir & "libosip2-2.2.1", "osip"
+ RenameFolder LibDestDir & "libosip2-2.2.2", "osip"
FSO.CopyFile Utilsdir & "osipparser2.vcproj", LibDestDir & "osip\platform\vsnet\", True
+ FSO.CopyFile Utilsdir & "osip2.vcproj", LibDestDir & "osip\platform\vsnet\", True
End If
If FSO.FolderExists(LibDestDir & "osip") Then
If BuildDebug Then
@@ -140,13 +141,13 @@ Sub BuildLibs_ModExosip(BuildDebug, BuildRelease)
End If
If Not FSO.FolderExists(LibDestDir & "libeXosip2") Then
- WgetUnTarGz "http://www.antisip.com/download/libeXosip2-1.9.1-pre17.tar.gz", LibDestDir
- If Not FSO.FolderExists(LibDestDir & "libeXosip2-1.9.1-pre17") Then
+ WgetUnTarGz "http://www.antisip.com/download/libeXosip2-2.2.2.tar.gz", LibDestDir
+ If Not FSO.FolderExists(LibDestDir & "libeXosip2-2.2.2") Then
Wscript.echo "Unable to get eXosip from default download location, Trying backup location:"
- WgetUnTarGz "http://www.sofaswitch.org/mikej/libeXosip2-1.9.1-pre17.tar.gz", LibDestDir
+ WgetUnTarGz "http://www.sofaswitch.org/mikej/libeXosip2-2.2.2.tar.gz", LibDestDir
End If
- RenameFolder LibDestDir & "libeXosip2-1.9.1-pre17", "libeXosip2"
- FSO.CopyFile Utilsdir & "eXosip.vcproj", LibDestDir & "libeXosip2\platform\vsnet\", True
+ RenameFolder LibDestDir & "libeXosip2-2.2.2", "libeXosip2"
+' FSO.CopyFile Utilsdir & "eXosip.vcproj", LibDestDir & "libeXosip2\platform\vsnet\", True
End If
If FSO.FolderExists(LibDestDir & "libeXosip2") Then
If BuildDebug Then
@@ -183,13 +184,13 @@ Sub BuildLibs_ModExosip(BuildDebug, BuildRelease)
End If
If FSO.FolderExists(LibDestDir & "jrtplib") And FSO.FolderExists(LibDestDir & "jthread-1.1.2") And FSO.FolderExists(LibDestDir & "jrtp4c")Then
If BuildDebug Then
- If Not FSO.FileExists(LibDestDir & "jrtp4c\w32\Debug\jrtp4c.lib") Then
+ If (Not FSO.FileExists(LibDestDir & "jrtp4c\w32\Debug\jrtp4c.lib")) Or (Not FSO.FileExists(LibDestDir & "jrtplib\Debug\jrtplib.lib")) Or (Not FSO.FileExists(LibDestDir & "jthread-1.1.2\Debug\jthread.lib")) Then
UpgradeViaDevEnv LibDestDir & "jrtp4c\w32\jrtp4c.sln"
BuildViaDevEnv LibDestDir & "jrtp4c\w32\jrtp4c.sln", "Debug"
End If
End If
If BuildRelease Then
- If Not FSO.FileExists(LibDestDir & "jrtp4c\w32\Release\jrtp4c.lib") Then
+ If (Not FSO.FileExists(LibDestDir & "jrtp4c\w32\Release\jrtp4c.lib")) Or (Not FSO.FileExists(LibDestDir & "jrtplib\Release\jrtplib.lib")) Or (Not FSO.FileExists(LibDestDir & "jthread-1.1.2\Release\jthread.lib")) Then
UpgradeViaDevEnv LibDestDir & "jrtp4c\w32\jrtp4c.sln"
BuildViaDevEnv LibDestDir & "jrtp4c\w32\jrtp4c.sln", "Release"
End If
diff --git a/w32/vsnet/Tools/osip2.vcproj b/w32/vsnet/Tools/osip2.vcproj
new file mode 100644
index 0000000000..9a8ee9665e
--- /dev/null
+++ b/w32/vsnet/Tools/osip2.vcproj
@@ -0,0 +1,290 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/w32/vsnet/Tools/osipparser2.vcproj b/w32/vsnet/Tools/osipparser2.vcproj
index d451222f41..74f00acded 100644
--- a/w32/vsnet/Tools/osipparser2.vcproj
+++ b/w32/vsnet/Tools/osipparser2.vcproj
@@ -1,108 +1,65 @@
+ RootNamespace="osipparser2"
+ Keyword="Win32Proj">
+ Name="Win32"/>
-
-
-
-
-
-
-
+ CharacterSet="2">
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
-
-
+ Name="VCCustomBuildTool"/>
+ OutputFile="$(OutDir)\osipparser2.lib"/>
+ Name="VCMIDLTool"/>
+ Name="VCPostBuildEventTool"/>
+ Name="VCPreBuildEventTool"/>
+ Name="VCPreLinkEventTool"/>
+ Name="VCResourceCompilerTool"/>
+
+
+
+
-
-
-
-
-
+ CharacterSet="2">
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
-
-
+ Name="VCCustomBuildTool"/>
+ OutputFile="$(OutDir)/osipparser2.lib"/>
+ Name="VCMIDLTool"/>
+ Name="VCPostBuildEventTool"/>
+ Name="VCPreBuildEventTool"/>
+ Name="VCPreLinkEventTool"/>
+ Name="VCResourceCompilerTool"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -150,324 +189,247 @@
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ RelativePath="..\..\src\osipparser2\osip_accept.c">
+ RelativePath="..\..\src\osipparser2\osip_accept_encoding.c">
+ RelativePath="..\..\src\osipparser2\osip_accept_language.c">
+ RelativePath="..\..\src\osipparser2\osip_alert_info.c">
+ RelativePath="..\..\src\osipparser2\osip_allow.c">
+ RelativePath="..\..\src\osipparser2\osip_authentication_info.c">
+ RelativePath="..\..\src\osipparser2\osip_authorization.c">
+ RelativePath="..\..\src\osipparser2\osip_body.c">
+ RelativePath="..\..\src\osipparser2\osip_call_id.c">
+ RelativePath="..\..\src\osipparser2\osip_call_info.c">
+ RelativePath="..\..\src\osipparser2\osip_contact.c">
+ RelativePath="..\..\src\osipparser2\osip_content_disposition.c">
+ RelativePath="..\..\src\osipparser2\osip_content_encoding.c">
+ RelativePath="..\..\src\osipparser2\osip_content_length.c">
+ RelativePath="..\..\src\osipparser2\osip_content_type.c">
+ RelativePath="..\..\src\osipparser2\osip_cseq.c">
+ RelativePath="..\..\src\osipparser2\osip_error_info.c">
+ RelativePath="..\..\src\osipparser2\osip_from.c">
+ RelativePath="..\..\src\osipparser2\osip_header.c">
+ RelativePath="..\..\src\osipparser2\osip_list.c">
+ RelativePath="..\..\src\osipparser2\osip_md5c.c">
+ RelativePath="..\..\src\osipparser2\osip_message.c">
+ RelativePath="..\..\src\osipparser2\osip_message_parse.c">
+ RelativePath="..\..\src\osipparser2\osip_message_to_str.c">
+ RelativePath="..\..\src\osipparser2\osip_mime_version.c">
+ RelativePath="..\..\src\osipparser2\osip_parser_cfg.c">
+ RelativePath="..\..\src\osipparser2\osip_port.c">
+ RelativePath="..\..\src\osipparser2\osip_proxy_authenticate.c">
+ RelativePath="..\..\src\osipparser2\osip_proxy_authentication_info.c">
+ RelativePath="..\..\src\osipparser2\osip_proxy_authorization.c">
+ RelativePath="..\..\src\osipparser2\osip_record_route.c">
+ RelativePath="..\..\src\osipparser2\osip_rfc3264.c">
+ RelativePath="..\..\src\osipparser2\osip_route.c">
+ RelativePath="..\..\src\osipparser2\osip_to.c">
+ RelativePath="..\..\src\osipparser2\osip_uri.c">
+ RelativePath="..\..\src\osipparser2\osip_via.c">
+ RelativePath="..\..\src\osipparser2\osip_www_authenticate.c">
+ RelativePath="..\..\src\osipparser2\sdp_accessor.c">
+ RelativePath="..\..\src\osipparser2\sdp_message.c">
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ RelativePath="..\..\include\osipparser2\headers\osip_accept.h">
+ RelativePath="..\..\include\osipparser2\headers\osip_accept_encoding.h">
+ RelativePath="..\..\include\osipparser2\headers\osip_accept_language.h">
+ RelativePath="..\..\include\osipparser2\headers\osip_alert_info.h">
+ RelativePath="..\..\include\osipparser2\headers\osip_allow.h">
+ RelativePath="..\..\include\osipparser2\headers\osip_authorization.h">
+ RelativePath="..\..\include\osipparser2\osip_body.h">
+ RelativePath="..\..\include\osipparser2\headers\osip_call_id.h">
+ RelativePath="..\..\include\osipparser2\headers\osip_call_info.h">
+ RelativePath="..\..\include\osipparser2\osip_const.h">
+ RelativePath="..\..\include\osipparser2\headers\osip_contact.h">
+ RelativePath="..\..\include\osipparser2\headers\osip_content_disposition.h">
+ RelativePath="..\..\include\osipparser2\headers\osip_content_encoding.h">
+ RelativePath="..\..\include\osipparser2\headers\osip_content_length.h">
+ RelativePath="..\..\include\osipparser2\headers\osip_content_type.h">
+ RelativePath="..\..\include\osipparser2\headers\osip_cseq.h">
+ RelativePath="..\..\include\osipparser2\headers\osip_error_info.h">
+ RelativePath="..\..\include\osipparser2\headers\osip_from.h">
+ RelativePath="..\..\include\osipparser2\headers\osip_header.h">
+ RelativePath="..\..\include\osipparser2\osip_headers.h">
+ RelativePath="..\..\include\osipparser2\osip_list.h">
+ RelativePath="..\..\include\osipparser2\osip_md5.h">
+ RelativePath="..\..\include\osipparser2\osip_message.h">
+ RelativePath="..\..\include\osipparser2\headers\osip_mime_version.h">
+ RelativePath="..\..\include\osipparser2\osip_parser.h">
+ RelativePath="..\..\include\osipparser2\osip_port.h">
+ RelativePath="..\..\include\osipparser2\headers\osip_proxy_authenticate.h">
+ RelativePath="..\..\include\osipparser2\headers\osip_proxy_authorization.h">
+ RelativePath="..\..\include\osipparser2\headers\osip_record_route.h">
+ RelativePath="..\..\src\osipparser2\osip_rfc3264i.h">
+ RelativePath="..\..\include\osipparser2\headers\osip_route.h">
+ RelativePath="..\..\include\osipparser2\headers\osip_to.h">
+ RelativePath="..\..\include\osipparser2\osip_uri.h">
+ RelativePath="..\..\include\osipparser2\headers\osip_via.h">
+ RelativePath="..\..\include\osipparser2\headers\osip_www_authenticate.h">
+ RelativePath="..\..\src\osipparser2\parser.h">
+ RelativePath="..\..\include\osipparser2\sdp_message.h">
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+
+