diff --git a/libs/jrtp4c/w32/msvc/jrtp4c.sln b/libs/jrtp4c/w32/jrtp4c.sln
similarity index 85%
rename from libs/jrtp4c/w32/msvc/jrtp4c.sln
rename to libs/jrtp4c/w32/jrtp4c.sln
index 61de65a743..ba6a0beacd 100644
--- a/libs/jrtp4c/w32/msvc/jrtp4c.sln
+++ b/libs/jrtp4c/w32/jrtp4c.sln
@@ -1,14 +1,14 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtp4c", "..\jrtp4c\jrtp4c.vcproj", "{E85B3E1F-B671-4E84-9F09-90F61A27D783}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtp4c", "jrtp4c.vcproj", "{E85B3E1F-B671-4E84-9F09-90F61A27D783}"
ProjectSection(ProjectDependencies) = postProject
{4009F58A-E333-424B-A868-7E82804DD055} = {4009F58A-E333-424B-A868-7E82804DD055}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jthread", "..\..\..\jthread\jthread.vcproj", "{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jthread", "..\..\jthread-1.1.2\jthread.vcproj", "{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtplib", "..\..\..\jrtplib\jrtplib.vcproj", "{4009F58A-E333-424B-A868-7E82804DD055}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtplib", "..\..\jrtplib-3.3.0\jrtplib.vcproj", "{4009F58A-E333-424B-A868-7E82804DD055}"
ProjectSection(ProjectDependencies) = postProject
{96A714AE-BE53-4EFF-8569-C3809AD4F3B6} = {96A714AE-BE53-4EFF-8569-C3809AD4F3B6}
EndProjectSection
diff --git a/libs/jrtp4c/w32/jrtp4c/jrtp4c.vcproj b/libs/jrtp4c/w32/jrtp4c.vcproj
similarity index 82%
rename from libs/jrtp4c/w32/jrtp4c/jrtp4c.vcproj
rename to libs/jrtp4c/w32/jrtp4c.vcproj
index 0a74b18980..d9858e7c75 100644
--- a/libs/jrtp4c/w32/jrtp4c/jrtp4c.vcproj
+++ b/libs/jrtp4c/w32/jrtp4c.vcproj
@@ -39,7 +39,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/D WIN32"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\jthread\src;..\..\..\jrtplib\src;..\..\src"
+ AdditionalIncludeDirectories=""$(ProjectDir)..\..\jthread-1.1.2\src";"$(ProjectDir)..\..\jrtplib-3.3.0\src";"$(ProjectDir)..\src""
RuntimeLibrary="1"
/>
<Tool
@@ -72,6 +72,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
>
@@ -92,6 +93,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""$(ProjectDir)..\..\jthread-1.1.2\src";"$(ProjectDir)..\..\jrtplib-3.3.0\src";"$(ProjectDir)..\src""
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -140,7 +142,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\..\src\jrtp4c.cpp"
+ RelativePath="..\src\jrtp4c.cpp"
>
</File>
</Filter>
@@ -150,7 +152,7 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
- RelativePath="..\..\src\jrtp4c.h"
+ RelativePath="..\src\jrtp4c.h"
>
</File>
</Filter>
diff --git a/src/mod/mod_exosip/mod_exosip.c b/src/mod/mod_exosip/mod_exosip.c
index 6beda2d980..31c097107e 100644
--- a/src/mod/mod_exosip/mod_exosip.c
+++ b/src/mod/mod_exosip/mod_exosip.c
@@ -34,7 +34,7 @@
#define HAVE_APR
#include <switch.h>
#include <jrtp4c.h>
-#include <eXosip2/eXosip.h>
+#include <eXosip/eXosip.h>
#include <osip2/osip_mt.h>
#include <osipparser2/osip_rfc3264.h>
#include <osipparser2/osip_port.h>
diff --git a/w32/vsnet/FreeSwitchCore.vcproj b/w32/vsnet/FreeSwitchCore.vcproj
index 62658c25c8..5d40162268 100644
--- a/w32/vsnet/FreeSwitchCore.vcproj
+++ b/w32/vsnet/FreeSwitchCore.vcproj
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\src\include;"..\..\..\apr-1.2.2\include""
+ AdditionalIncludeDirectories="..\..\src\include;"..\..\libs\apr-1.2.2\include""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -94,6 +94,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy $(Projectdir)..\..\libs\apr-1.2.2\Debug\*.dll $(Outdir)"
/>
</Configuration>
<Configuration
@@ -121,7 +122,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(InputDir)include;$(InputDir)..\libs\apr-1.2.2\include"
+ AdditionalIncludeDirectories="..\..\src\include;"..\..\libs\apr-1.2.2\include""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
@@ -173,6 +174,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy $(Projectdir)..\..\libs\apr-1.2.2\Release\*.dll $(Outdir)"
/>
</Configuration>
</Configurations>
diff --git a/w32/vsnet/Freeswitch.sln b/w32/vsnet/Freeswitch.sln
index 1ed99e3185..5e4aecd9ea 100644
--- a/w32/vsnet/Freeswitch.sln
+++ b/w32/vsnet/Freeswitch.sln
@@ -13,90 +13,98 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchConsole", "FreeSw
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_bridgecall", "mod_bridgecall.vcproj", "{E1794405-29D4-466D-9BE3-DD2344C2A663}"
ProjectSection(ProjectDependencies) = postProject
- {13860EB7-038A-438F-898F-1032E42A5574} = {13860EB7-038A-438F-898F-1032E42A5574}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {13860EB7-038A-438F-898F-1032E42A5574} = {13860EB7-038A-438F-898F-1032E42A5574}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_softtimer", "mod_softtimer.vcproj", "{DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}"
ProjectSection(ProjectDependencies) = postProject
- {13860EB7-038A-438F-898F-1032E42A5574} = {13860EB7-038A-438F-898F-1032E42A5574}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {13860EB7-038A-438F-898F-1032E42A5574} = {13860EB7-038A-438F-898F-1032E42A5574}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dialplan_demo", "mod_dialplan_demo.vcproj", "{2988EB83-785F-45D4-8731-8E1E4345177E}"
ProjectSection(ProjectDependencies) = postProject
- {13860EB7-038A-438F-898F-1032E42A5574} = {13860EB7-038A-438F-898F-1032E42A5574}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {13860EB7-038A-438F-898F-1032E42A5574} = {13860EB7-038A-438F-898F-1032E42A5574}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_exosip", "mod_exosip.vcproj", "{45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}"
ProjectSection(ProjectDependencies) = postProject
{85255507-5D16-4218-85E2-F683BB2F04DA} = {85255507-5D16-4218-85E2-F683BB2F04DA}
{E85B3E1F-B671-4E84-9F09-90F61A27D783} = {E85B3E1F-B671-4E84-9F09-90F61A27D783}
- {13860EB7-038A-438F-898F-1032E42A5574} = {13860EB7-038A-438F-898F-1032E42A5574}
- {44F46B7E-0E51-4304-9735-330DFBAB41E5} = {44F46B7E-0E51-4304-9735-330DFBAB41E5}
- {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
{4EA67539-9EE9-4065-BD39-87E517FD8262} = {4EA67539-9EE9-4065-BD39-87E517FD8262}
+ {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {44F46B7E-0E51-4304-9735-330DFBAB41E5} = {44F46B7E-0E51-4304-9735-330DFBAB41E5}
+ {13860EB7-038A-438F-898F-1032E42A5574} = {13860EB7-038A-438F-898F-1032E42A5574}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g711codec", "mod_g711codec.vcproj", "{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}"
ProjectSection(ProjectDependencies) = postProject
- {13860EB7-038A-438F-898F-1032E42A5574} = {13860EB7-038A-438F-898F-1032E42A5574}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {13860EB7-038A-438F-898F-1032E42A5574} = {13860EB7-038A-438F-898F-1032E42A5574}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_playback", "mod_playback.vcproj", "{78100236-7CEA-4948-96CC-E8ED3160329C}"
ProjectSection(ProjectDependencies) = postProject
- {13860EB7-038A-438F-898F-1032E42A5574} = {13860EB7-038A-438F-898F-1032E42A5574}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {13860EB7-038A-438F-898F-1032E42A5574} = {13860EB7-038A-438F-898F-1032E42A5574}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rawaudio", "mod_rawaudio.vcproj", "{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}"
ProjectSection(ProjectDependencies) = postProject
- {13860EB7-038A-438F-898F-1032E42A5574} = {13860EB7-038A-438F-898F-1032E42A5574}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {13860EB7-038A-438F-898F-1032E42A5574} = {13860EB7-038A-438F-898F-1032E42A5574}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_woomerachan", "mod_woomerachan.vcproj", "{FE3540C5-3303-46E0-A69E-D92F775687F1}"
ProjectSection(ProjectDependencies) = postProject
- {13860EB7-038A-438F-898F-1032E42A5574} = {13860EB7-038A-438F-898F-1032E42A5574}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {13860EB7-038A-438F-898F-1032E42A5574} = {13860EB7-038A-438F-898F-1032E42A5574}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libapr", "..\..\..\apr\libapr.vcproj", "{13860EB7-038A-438F-898F-1032E42A5574}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libapr", "..\..\libs\apr-1.2.2\libapr.vcproj", "{13860EB7-038A-438F-898F-1032E42A5574}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osip2", "..\..\..\osip\platform\vsnet\osip2.vcproj", "{85255507-5D16-4218-85E2-F683BB2F04DA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osip2", "..\..\libs\libosip2-2.2.0\platform\vsnet\osip2.vcproj", "{85255507-5D16-4218-85E2-F683BB2F04DA}"
ProjectSection(ProjectDependencies) = postProject
{44F46B7E-0E51-4304-9735-330DFBAB41E5} = {44F46B7E-0E51-4304-9735-330DFBAB41E5}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osipparser2", "..\..\..\osip\platform\vsnet\osipparser2.vcproj", "{44F46B7E-0E51-4304-9735-330DFBAB41E5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osipparser2", "..\..\libs\libosip2-2.2.0\platform\vsnet\osipparser2.vcproj", "{44F46B7E-0E51-4304-9735-330DFBAB41E5}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eXosip", "..\..\..\eXosip\platform\vsnet\eXosip.vcproj", "{4EA67539-9EE9-4065-BD39-87E517FD8262}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eXosip", "..\..\libs\libeXosip-0.9.0\platform\windows\eXosip.vcproj", "{4EA67539-9EE9-4065-BD39-87E517FD8262}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtp4c", "..\..\..\jrtp4c\w32\jrtp4c\jrtp4c.vcproj", "{E85B3E1F-B671-4E84-9F09-90F61A27D783}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtp4c", "..\..\libs\jrtp4c\w32\jrtp4c.vcproj", "{E85B3E1F-B671-4E84-9F09-90F61A27D783}"
ProjectSection(ProjectDependencies) = postProject
{4009F58A-E333-424B-A868-7E82804DD055} = {4009F58A-E333-424B-A868-7E82804DD055}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jthread", "..\..\..\jthread\jthread.vcproj", "{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jthread", "..\..\libs\jthread-1.1.2\jthread.vcproj", "{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtplib", "..\..\..\jrtplib\jrtplib.vcproj", "{4009F58A-E333-424B-A868-7E82804DD055}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtplib", "..\..\libs\jrtplib-3.3.0\jrtplib.vcproj", "{4009F58A-E333-424B-A868-7E82804DD055}"
ProjectSection(ProjectDependencies) = postProject
{96A714AE-BE53-4EFF-8569-C3809AD4F3B6} = {96A714AE-BE53-4EFF-8569-C3809AD4F3B6}
EndProjectSection
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "mod_exosip_deps", "mod_exosip_deps", "{40D9233D-E463-4DD6-AB34-47BC3BFBED19}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mod", "Mod", "{AC923B27-D665-490E-94F5-FA40E1607FB6}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug DLL|Win32 = Debug DLL|Win32
Debug IPv6 MSR|Win32 = Debug IPv6 MSR|Win32
Debug IPv6 Musica|Win32 = Debug IPv6 Musica|Win32
Debug IPv6 Win2000|Win32 = Debug IPv6 Win2000|Win32
Debug|Win32 = Debug|Win32
+ Release DLL|Win32 = Release DLL|Win32
Release IPv6 Win2000|Win32 = Release IPv6 Win2000|Win32
Release IPv6 XP|Win32 = Release IPv6 XP|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Debug DLL|Win32.ActiveCfg = Debug|Win32
+ {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Debug DLL|Win32.Build.0 = Debug|Win32
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Debug IPv6 MSR|Win32.ActiveCfg = Debug|Win32
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Debug IPv6 MSR|Win32.Build.0 = Debug|Win32
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Debug IPv6 Musica|Win32.ActiveCfg = Debug|Win32
@@ -105,12 +113,16 @@ Global
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Debug IPv6 Win2000|Win32.Build.0 = Debug|Win32
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Debug|Win32.ActiveCfg = Debug|Win32
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Debug|Win32.Build.0 = Debug|Win32
+ {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Release DLL|Win32.ActiveCfg = Release|Win32
+ {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Release DLL|Win32.Build.0 = Release|Win32
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Release IPv6 Win2000|Win32.ActiveCfg = Release|Win32
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Release IPv6 Win2000|Win32.Build.0 = Release|Win32
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Release IPv6 XP|Win32.ActiveCfg = Release|Win32
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Release IPv6 XP|Win32.Build.0 = Release|Win32
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Release|Win32.ActiveCfg = Release|Win32
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Release|Win32.Build.0 = Release|Win32
+ {1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Debug DLL|Win32.ActiveCfg = Debug|Win32
+ {1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Debug DLL|Win32.Build.0 = Debug|Win32
{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Debug IPv6 MSR|Win32.ActiveCfg = Debug|Win32
{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Debug IPv6 MSR|Win32.Build.0 = Debug|Win32
{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Debug IPv6 Musica|Win32.ActiveCfg = Debug|Win32
@@ -119,12 +131,16 @@ Global
{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Debug IPv6 Win2000|Win32.Build.0 = Debug|Win32
{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Debug|Win32.ActiveCfg = Debug|Win32
{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Debug|Win32.Build.0 = Debug|Win32
+ {1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Release DLL|Win32.ActiveCfg = Release|Win32
+ {1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Release DLL|Win32.Build.0 = Release|Win32
{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Release IPv6 Win2000|Win32.ActiveCfg = Release|Win32
{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Release IPv6 Win2000|Win32.Build.0 = Release|Win32
{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Release IPv6 XP|Win32.ActiveCfg = Release|Win32
{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Release IPv6 XP|Win32.Build.0 = Release|Win32
{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Release|Win32.ActiveCfg = Release|Win32
{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Release|Win32.Build.0 = Release|Win32
+ {E1794405-29D4-466D-9BE3-DD2344C2A663}.Debug DLL|Win32.ActiveCfg = Debug|Win32
+ {E1794405-29D4-466D-9BE3-DD2344C2A663}.Debug DLL|Win32.Build.0 = Debug|Win32
{E1794405-29D4-466D-9BE3-DD2344C2A663}.Debug IPv6 MSR|Win32.ActiveCfg = Debug|Win32
{E1794405-29D4-466D-9BE3-DD2344C2A663}.Debug IPv6 MSR|Win32.Build.0 = Debug|Win32
{E1794405-29D4-466D-9BE3-DD2344C2A663}.Debug IPv6 Musica|Win32.ActiveCfg = Debug|Win32
@@ -133,12 +149,16 @@ Global
{E1794405-29D4-466D-9BE3-DD2344C2A663}.Debug IPv6 Win2000|Win32.Build.0 = Debug|Win32
{E1794405-29D4-466D-9BE3-DD2344C2A663}.Debug|Win32.ActiveCfg = Debug|Win32
{E1794405-29D4-466D-9BE3-DD2344C2A663}.Debug|Win32.Build.0 = Debug|Win32
+ {E1794405-29D4-466D-9BE3-DD2344C2A663}.Release DLL|Win32.ActiveCfg = Release|Win32
+ {E1794405-29D4-466D-9BE3-DD2344C2A663}.Release DLL|Win32.Build.0 = Release|Win32
{E1794405-29D4-466D-9BE3-DD2344C2A663}.Release IPv6 Win2000|Win32.ActiveCfg = Release|Win32
{E1794405-29D4-466D-9BE3-DD2344C2A663}.Release IPv6 Win2000|Win32.Build.0 = Release|Win32
{E1794405-29D4-466D-9BE3-DD2344C2A663}.Release IPv6 XP|Win32.ActiveCfg = Release|Win32
{E1794405-29D4-466D-9BE3-DD2344C2A663}.Release IPv6 XP|Win32.Build.0 = Release|Win32
{E1794405-29D4-466D-9BE3-DD2344C2A663}.Release|Win32.ActiveCfg = Release|Win32
{E1794405-29D4-466D-9BE3-DD2344C2A663}.Release|Win32.Build.0 = Release|Win32
+ {DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}.Debug DLL|Win32.ActiveCfg = Debug|Win32
+ {DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}.Debug DLL|Win32.Build.0 = Debug|Win32
{DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}.Debug IPv6 MSR|Win32.ActiveCfg = Debug|Win32
{DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}.Debug IPv6 MSR|Win32.Build.0 = Debug|Win32
{DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}.Debug IPv6 Musica|Win32.ActiveCfg = Debug|Win32
@@ -147,12 +167,16 @@ Global
{DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}.Debug IPv6 Win2000|Win32.Build.0 = Debug|Win32
{DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}.Debug|Win32.ActiveCfg = Debug|Win32
{DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}.Debug|Win32.Build.0 = Debug|Win32
+ {DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}.Release DLL|Win32.ActiveCfg = Release|Win32
+ {DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}.Release DLL|Win32.Build.0 = Release|Win32
{DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}.Release IPv6 Win2000|Win32.ActiveCfg = Release|Win32
{DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}.Release IPv6 Win2000|Win32.Build.0 = Release|Win32
{DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}.Release IPv6 XP|Win32.ActiveCfg = Release|Win32
{DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}.Release IPv6 XP|Win32.Build.0 = Release|Win32
{DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}.Release|Win32.ActiveCfg = Release|Win32
{DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}.Release|Win32.Build.0 = Release|Win32
+ {2988EB83-785F-45D4-8731-8E1E4345177E}.Debug DLL|Win32.ActiveCfg = Debug|Win32
+ {2988EB83-785F-45D4-8731-8E1E4345177E}.Debug DLL|Win32.Build.0 = Debug|Win32
{2988EB83-785F-45D4-8731-8E1E4345177E}.Debug IPv6 MSR|Win32.ActiveCfg = Debug|Win32
{2988EB83-785F-45D4-8731-8E1E4345177E}.Debug IPv6 MSR|Win32.Build.0 = Debug|Win32
{2988EB83-785F-45D4-8731-8E1E4345177E}.Debug IPv6 Musica|Win32.ActiveCfg = Debug|Win32
@@ -161,12 +185,16 @@ Global
{2988EB83-785F-45D4-8731-8E1E4345177E}.Debug IPv6 Win2000|Win32.Build.0 = Debug|Win32
{2988EB83-785F-45D4-8731-8E1E4345177E}.Debug|Win32.ActiveCfg = Debug|Win32
{2988EB83-785F-45D4-8731-8E1E4345177E}.Debug|Win32.Build.0 = Debug|Win32
+ {2988EB83-785F-45D4-8731-8E1E4345177E}.Release DLL|Win32.ActiveCfg = Release|Win32
+ {2988EB83-785F-45D4-8731-8E1E4345177E}.Release DLL|Win32.Build.0 = Release|Win32
{2988EB83-785F-45D4-8731-8E1E4345177E}.Release IPv6 Win2000|Win32.ActiveCfg = Release|Win32
{2988EB83-785F-45D4-8731-8E1E4345177E}.Release IPv6 Win2000|Win32.Build.0 = Release|Win32
{2988EB83-785F-45D4-8731-8E1E4345177E}.Release IPv6 XP|Win32.ActiveCfg = Release|Win32
{2988EB83-785F-45D4-8731-8E1E4345177E}.Release IPv6 XP|Win32.Build.0 = Release|Win32
{2988EB83-785F-45D4-8731-8E1E4345177E}.Release|Win32.ActiveCfg = Release|Win32
{2988EB83-785F-45D4-8731-8E1E4345177E}.Release|Win32.Build.0 = Release|Win32
+ {45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}.Debug DLL|Win32.ActiveCfg = Debug|Win32
+ {45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}.Debug DLL|Win32.Build.0 = Debug|Win32
{45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}.Debug IPv6 MSR|Win32.ActiveCfg = Debug|Win32
{45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}.Debug IPv6 MSR|Win32.Build.0 = Debug|Win32
{45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}.Debug IPv6 Musica|Win32.ActiveCfg = Debug|Win32
@@ -175,12 +203,16 @@ Global
{45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}.Debug IPv6 Win2000|Win32.Build.0 = Debug|Win32
{45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}.Debug|Win32.ActiveCfg = Debug|Win32
{45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}.Debug|Win32.Build.0 = Debug|Win32
+ {45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}.Release DLL|Win32.ActiveCfg = Release|Win32
+ {45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}.Release DLL|Win32.Build.0 = Release|Win32
{45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}.Release IPv6 Win2000|Win32.ActiveCfg = Release|Win32
{45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}.Release IPv6 Win2000|Win32.Build.0 = Release|Win32
{45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}.Release IPv6 XP|Win32.ActiveCfg = Release|Win32
{45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}.Release IPv6 XP|Win32.Build.0 = Release|Win32
{45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}.Release|Win32.ActiveCfg = Release|Win32
{45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}.Release|Win32.Build.0 = Release|Win32
+ {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Debug DLL|Win32.ActiveCfg = Debug|Win32
+ {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Debug DLL|Win32.Build.0 = Debug|Win32
{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Debug IPv6 MSR|Win32.ActiveCfg = Debug|Win32
{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Debug IPv6 MSR|Win32.Build.0 = Debug|Win32
{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Debug IPv6 Musica|Win32.ActiveCfg = Debug|Win32
@@ -189,12 +221,16 @@ Global
{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Debug IPv6 Win2000|Win32.Build.0 = Debug|Win32
{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Debug|Win32.ActiveCfg = Debug|Win32
{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Debug|Win32.Build.0 = Debug|Win32
+ {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Release DLL|Win32.ActiveCfg = Release|Win32
+ {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Release DLL|Win32.Build.0 = Release|Win32
{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Release IPv6 Win2000|Win32.ActiveCfg = Release|Win32
{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Release IPv6 Win2000|Win32.Build.0 = Release|Win32
{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Release IPv6 XP|Win32.ActiveCfg = Release|Win32
{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Release IPv6 XP|Win32.Build.0 = Release|Win32
{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Release|Win32.ActiveCfg = Release|Win32
{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Release|Win32.Build.0 = Release|Win32
+ {78100236-7CEA-4948-96CC-E8ED3160329C}.Debug DLL|Win32.ActiveCfg = Debug|Win32
+ {78100236-7CEA-4948-96CC-E8ED3160329C}.Debug DLL|Win32.Build.0 = Debug|Win32
{78100236-7CEA-4948-96CC-E8ED3160329C}.Debug IPv6 MSR|Win32.ActiveCfg = Debug|Win32
{78100236-7CEA-4948-96CC-E8ED3160329C}.Debug IPv6 MSR|Win32.Build.0 = Debug|Win32
{78100236-7CEA-4948-96CC-E8ED3160329C}.Debug IPv6 Musica|Win32.ActiveCfg = Debug|Win32
@@ -203,12 +239,16 @@ Global
{78100236-7CEA-4948-96CC-E8ED3160329C}.Debug IPv6 Win2000|Win32.Build.0 = Debug|Win32
{78100236-7CEA-4948-96CC-E8ED3160329C}.Debug|Win32.ActiveCfg = Debug|Win32
{78100236-7CEA-4948-96CC-E8ED3160329C}.Debug|Win32.Build.0 = Debug|Win32
+ {78100236-7CEA-4948-96CC-E8ED3160329C}.Release DLL|Win32.ActiveCfg = Release|Win32
+ {78100236-7CEA-4948-96CC-E8ED3160329C}.Release DLL|Win32.Build.0 = Release|Win32
{78100236-7CEA-4948-96CC-E8ED3160329C}.Release IPv6 Win2000|Win32.ActiveCfg = Release|Win32
{78100236-7CEA-4948-96CC-E8ED3160329C}.Release IPv6 Win2000|Win32.Build.0 = Release|Win32
{78100236-7CEA-4948-96CC-E8ED3160329C}.Release IPv6 XP|Win32.ActiveCfg = Release|Win32
{78100236-7CEA-4948-96CC-E8ED3160329C}.Release IPv6 XP|Win32.Build.0 = Release|Win32
{78100236-7CEA-4948-96CC-E8ED3160329C}.Release|Win32.ActiveCfg = Release|Win32
{78100236-7CEA-4948-96CC-E8ED3160329C}.Release|Win32.Build.0 = Release|Win32
+ {5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Debug DLL|Win32.ActiveCfg = Debug|Win32
+ {5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Debug DLL|Win32.Build.0 = Debug|Win32
{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Debug IPv6 MSR|Win32.ActiveCfg = Debug|Win32
{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Debug IPv6 MSR|Win32.Build.0 = Debug|Win32
{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Debug IPv6 Musica|Win32.ActiveCfg = Debug|Win32
@@ -217,12 +257,16 @@ Global
{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Debug IPv6 Win2000|Win32.Build.0 = Debug|Win32
{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Debug|Win32.ActiveCfg = Debug|Win32
{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Debug|Win32.Build.0 = Debug|Win32
+ {5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Release DLL|Win32.ActiveCfg = Release|Win32
+ {5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Release DLL|Win32.Build.0 = Release|Win32
{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Release IPv6 Win2000|Win32.ActiveCfg = Release|Win32
{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Release IPv6 Win2000|Win32.Build.0 = Release|Win32
{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Release IPv6 XP|Win32.ActiveCfg = Release|Win32
{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Release IPv6 XP|Win32.Build.0 = Release|Win32
{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Release|Win32.ActiveCfg = Release|Win32
{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Release|Win32.Build.0 = Release|Win32
+ {FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug DLL|Win32.ActiveCfg = Debug|Win32
+ {FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug DLL|Win32.Build.0 = Debug|Win32
{FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug IPv6 MSR|Win32.ActiveCfg = Debug|Win32
{FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug IPv6 MSR|Win32.Build.0 = Debug|Win32
{FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug IPv6 Musica|Win32.ActiveCfg = Debug|Win32
@@ -231,12 +275,16 @@ Global
{FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug IPv6 Win2000|Win32.Build.0 = Debug|Win32
{FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|Win32.ActiveCfg = Debug|Win32
{FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|Win32.Build.0 = Debug|Win32
+ {FE3540C5-3303-46E0-A69E-D92F775687F1}.Release DLL|Win32.ActiveCfg = Release|Win32
+ {FE3540C5-3303-46E0-A69E-D92F775687F1}.Release DLL|Win32.Build.0 = Release|Win32
{FE3540C5-3303-46E0-A69E-D92F775687F1}.Release IPv6 Win2000|Win32.ActiveCfg = Release|Win32
{FE3540C5-3303-46E0-A69E-D92F775687F1}.Release IPv6 Win2000|Win32.Build.0 = Release|Win32
{FE3540C5-3303-46E0-A69E-D92F775687F1}.Release IPv6 XP|Win32.ActiveCfg = Release|Win32
{FE3540C5-3303-46E0-A69E-D92F775687F1}.Release IPv6 XP|Win32.Build.0 = Release|Win32
{FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|Win32.ActiveCfg = Release|Win32
{FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|Win32.Build.0 = Release|Win32
+ {13860EB7-038A-438F-898F-1032E42A5574}.Debug DLL|Win32.ActiveCfg = Debug|Win32
+ {13860EB7-038A-438F-898F-1032E42A5574}.Debug DLL|Win32.Build.0 = Debug|Win32
{13860EB7-038A-438F-898F-1032E42A5574}.Debug IPv6 MSR|Win32.ActiveCfg = Debug|Win32
{13860EB7-038A-438F-898F-1032E42A5574}.Debug IPv6 MSR|Win32.Build.0 = Debug|Win32
{13860EB7-038A-438F-898F-1032E42A5574}.Debug IPv6 Musica|Win32.ActiveCfg = Debug|Win32
@@ -245,12 +293,16 @@ Global
{13860EB7-038A-438F-898F-1032E42A5574}.Debug IPv6 Win2000|Win32.Build.0 = Debug|Win32
{13860EB7-038A-438F-898F-1032E42A5574}.Debug|Win32.ActiveCfg = Debug|Win32
{13860EB7-038A-438F-898F-1032E42A5574}.Debug|Win32.Build.0 = Debug|Win32
+ {13860EB7-038A-438F-898F-1032E42A5574}.Release DLL|Win32.ActiveCfg = Release|Win32
+ {13860EB7-038A-438F-898F-1032E42A5574}.Release DLL|Win32.Build.0 = Release|Win32
{13860EB7-038A-438F-898F-1032E42A5574}.Release IPv6 Win2000|Win32.ActiveCfg = Release|Win32
{13860EB7-038A-438F-898F-1032E42A5574}.Release IPv6 Win2000|Win32.Build.0 = Release|Win32
{13860EB7-038A-438F-898F-1032E42A5574}.Release IPv6 XP|Win32.ActiveCfg = Release|Win32
{13860EB7-038A-438F-898F-1032E42A5574}.Release IPv6 XP|Win32.Build.0 = Release|Win32
{13860EB7-038A-438F-898F-1032E42A5574}.Release|Win32.ActiveCfg = Release|Win32
{13860EB7-038A-438F-898F-1032E42A5574}.Release|Win32.Build.0 = Release|Win32
+ {85255507-5D16-4218-85E2-F683BB2F04DA}.Debug DLL|Win32.ActiveCfg = Debug|Win32
+ {85255507-5D16-4218-85E2-F683BB2F04DA}.Debug DLL|Win32.Build.0 = Debug|Win32
{85255507-5D16-4218-85E2-F683BB2F04DA}.Debug IPv6 MSR|Win32.ActiveCfg = Debug|Win32
{85255507-5D16-4218-85E2-F683BB2F04DA}.Debug IPv6 MSR|Win32.Build.0 = Debug|Win32
{85255507-5D16-4218-85E2-F683BB2F04DA}.Debug IPv6 Musica|Win32.ActiveCfg = Debug|Win32
@@ -259,12 +311,16 @@ Global
{85255507-5D16-4218-85E2-F683BB2F04DA}.Debug IPv6 Win2000|Win32.Build.0 = Debug|Win32
{85255507-5D16-4218-85E2-F683BB2F04DA}.Debug|Win32.ActiveCfg = Debug|Win32
{85255507-5D16-4218-85E2-F683BB2F04DA}.Debug|Win32.Build.0 = Debug|Win32
+ {85255507-5D16-4218-85E2-F683BB2F04DA}.Release DLL|Win32.ActiveCfg = Release|Win32
+ {85255507-5D16-4218-85E2-F683BB2F04DA}.Release DLL|Win32.Build.0 = Release|Win32
{85255507-5D16-4218-85E2-F683BB2F04DA}.Release IPv6 Win2000|Win32.ActiveCfg = Release|Win32
{85255507-5D16-4218-85E2-F683BB2F04DA}.Release IPv6 Win2000|Win32.Build.0 = Release|Win32
{85255507-5D16-4218-85E2-F683BB2F04DA}.Release IPv6 XP|Win32.ActiveCfg = Release|Win32
{85255507-5D16-4218-85E2-F683BB2F04DA}.Release IPv6 XP|Win32.Build.0 = Release|Win32
{85255507-5D16-4218-85E2-F683BB2F04DA}.Release|Win32.ActiveCfg = Release|Win32
{85255507-5D16-4218-85E2-F683BB2F04DA}.Release|Win32.Build.0 = Release|Win32
+ {44F46B7E-0E51-4304-9735-330DFBAB41E5}.Debug DLL|Win32.ActiveCfg = Debug|Win32
+ {44F46B7E-0E51-4304-9735-330DFBAB41E5}.Debug DLL|Win32.Build.0 = Debug|Win32
{44F46B7E-0E51-4304-9735-330DFBAB41E5}.Debug IPv6 MSR|Win32.ActiveCfg = Debug|Win32
{44F46B7E-0E51-4304-9735-330DFBAB41E5}.Debug IPv6 MSR|Win32.Build.0 = Debug|Win32
{44F46B7E-0E51-4304-9735-330DFBAB41E5}.Debug IPv6 Musica|Win32.ActiveCfg = Debug|Win32
@@ -273,12 +329,16 @@ Global
{44F46B7E-0E51-4304-9735-330DFBAB41E5}.Debug IPv6 Win2000|Win32.Build.0 = Debug|Win32
{44F46B7E-0E51-4304-9735-330DFBAB41E5}.Debug|Win32.ActiveCfg = Debug|Win32
{44F46B7E-0E51-4304-9735-330DFBAB41E5}.Debug|Win32.Build.0 = Debug|Win32
+ {44F46B7E-0E51-4304-9735-330DFBAB41E5}.Release DLL|Win32.ActiveCfg = Release|Win32
+ {44F46B7E-0E51-4304-9735-330DFBAB41E5}.Release DLL|Win32.Build.0 = Release|Win32
{44F46B7E-0E51-4304-9735-330DFBAB41E5}.Release IPv6 Win2000|Win32.ActiveCfg = Release|Win32
{44F46B7E-0E51-4304-9735-330DFBAB41E5}.Release IPv6 Win2000|Win32.Build.0 = Release|Win32
{44F46B7E-0E51-4304-9735-330DFBAB41E5}.Release IPv6 XP|Win32.ActiveCfg = Release|Win32
{44F46B7E-0E51-4304-9735-330DFBAB41E5}.Release IPv6 XP|Win32.Build.0 = Release|Win32
{44F46B7E-0E51-4304-9735-330DFBAB41E5}.Release|Win32.ActiveCfg = Release|Win32
{44F46B7E-0E51-4304-9735-330DFBAB41E5}.Release|Win32.Build.0 = Release|Win32
+ {4EA67539-9EE9-4065-BD39-87E517FD8262}.Debug DLL|Win32.ActiveCfg = Debug DLL|Win32
+ {4EA67539-9EE9-4065-BD39-87E517FD8262}.Debug DLL|Win32.Build.0 = Debug DLL|Win32
{4EA67539-9EE9-4065-BD39-87E517FD8262}.Debug IPv6 MSR|Win32.ActiveCfg = Debug|Win32
{4EA67539-9EE9-4065-BD39-87E517FD8262}.Debug IPv6 MSR|Win32.Build.0 = Debug|Win32
{4EA67539-9EE9-4065-BD39-87E517FD8262}.Debug IPv6 Musica|Win32.ActiveCfg = Debug|Win32
@@ -287,12 +347,16 @@ Global
{4EA67539-9EE9-4065-BD39-87E517FD8262}.Debug IPv6 Win2000|Win32.Build.0 = Debug|Win32
{4EA67539-9EE9-4065-BD39-87E517FD8262}.Debug|Win32.ActiveCfg = Debug|Win32
{4EA67539-9EE9-4065-BD39-87E517FD8262}.Debug|Win32.Build.0 = Debug|Win32
+ {4EA67539-9EE9-4065-BD39-87E517FD8262}.Release DLL|Win32.ActiveCfg = Release DLL|Win32
+ {4EA67539-9EE9-4065-BD39-87E517FD8262}.Release DLL|Win32.Build.0 = Release DLL|Win32
{4EA67539-9EE9-4065-BD39-87E517FD8262}.Release IPv6 Win2000|Win32.ActiveCfg = Release|Win32
{4EA67539-9EE9-4065-BD39-87E517FD8262}.Release IPv6 Win2000|Win32.Build.0 = Release|Win32
{4EA67539-9EE9-4065-BD39-87E517FD8262}.Release IPv6 XP|Win32.ActiveCfg = Release|Win32
{4EA67539-9EE9-4065-BD39-87E517FD8262}.Release IPv6 XP|Win32.Build.0 = Release|Win32
{4EA67539-9EE9-4065-BD39-87E517FD8262}.Release|Win32.ActiveCfg = Release|Win32
{4EA67539-9EE9-4065-BD39-87E517FD8262}.Release|Win32.Build.0 = Release|Win32
+ {E85B3E1F-B671-4E84-9F09-90F61A27D783}.Debug DLL|Win32.ActiveCfg = Debug|Win32
+ {E85B3E1F-B671-4E84-9F09-90F61A27D783}.Debug DLL|Win32.Build.0 = Debug|Win32
{E85B3E1F-B671-4E84-9F09-90F61A27D783}.Debug IPv6 MSR|Win32.ActiveCfg = Debug|Win32
{E85B3E1F-B671-4E84-9F09-90F61A27D783}.Debug IPv6 MSR|Win32.Build.0 = Debug|Win32
{E85B3E1F-B671-4E84-9F09-90F61A27D783}.Debug IPv6 Musica|Win32.ActiveCfg = Debug|Win32
@@ -301,12 +365,16 @@ Global
{E85B3E1F-B671-4E84-9F09-90F61A27D783}.Debug IPv6 Win2000|Win32.Build.0 = Debug|Win32
{E85B3E1F-B671-4E84-9F09-90F61A27D783}.Debug|Win32.ActiveCfg = Debug|Win32
{E85B3E1F-B671-4E84-9F09-90F61A27D783}.Debug|Win32.Build.0 = Debug|Win32
+ {E85B3E1F-B671-4E84-9F09-90F61A27D783}.Release DLL|Win32.ActiveCfg = Release|Win32
+ {E85B3E1F-B671-4E84-9F09-90F61A27D783}.Release DLL|Win32.Build.0 = Release|Win32
{E85B3E1F-B671-4E84-9F09-90F61A27D783}.Release IPv6 Win2000|Win32.ActiveCfg = Release|Win32
{E85B3E1F-B671-4E84-9F09-90F61A27D783}.Release IPv6 Win2000|Win32.Build.0 = Release|Win32
{E85B3E1F-B671-4E84-9F09-90F61A27D783}.Release IPv6 XP|Win32.ActiveCfg = Release|Win32
{E85B3E1F-B671-4E84-9F09-90F61A27D783}.Release IPv6 XP|Win32.Build.0 = Release|Win32
{E85B3E1F-B671-4E84-9F09-90F61A27D783}.Release|Win32.ActiveCfg = Release|Win32
{E85B3E1F-B671-4E84-9F09-90F61A27D783}.Release|Win32.Build.0 = Release|Win32
+ {96A714AE-BE53-4EFF-8569-C3809AD4F3B6}.Debug DLL|Win32.ActiveCfg = Debug|Win32
+ {96A714AE-BE53-4EFF-8569-C3809AD4F3B6}.Debug DLL|Win32.Build.0 = Debug|Win32
{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}.Debug IPv6 MSR|Win32.ActiveCfg = Debug|Win32
{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}.Debug IPv6 MSR|Win32.Build.0 = Debug|Win32
{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}.Debug IPv6 Musica|Win32.ActiveCfg = Debug|Win32
@@ -315,12 +383,16 @@ Global
{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}.Debug IPv6 Win2000|Win32.Build.0 = Debug|Win32
{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}.Debug|Win32.ActiveCfg = Debug|Win32
{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}.Debug|Win32.Build.0 = Debug|Win32
+ {96A714AE-BE53-4EFF-8569-C3809AD4F3B6}.Release DLL|Win32.ActiveCfg = Release|Win32
+ {96A714AE-BE53-4EFF-8569-C3809AD4F3B6}.Release DLL|Win32.Build.0 = Release|Win32
{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}.Release IPv6 Win2000|Win32.ActiveCfg = Release|Win32
{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}.Release IPv6 Win2000|Win32.Build.0 = Release|Win32
{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}.Release IPv6 XP|Win32.ActiveCfg = Release|Win32
{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}.Release IPv6 XP|Win32.Build.0 = Release|Win32
{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}.Release|Win32.ActiveCfg = Release|Win32
{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}.Release|Win32.Build.0 = Release|Win32
+ {4009F58A-E333-424B-A868-7E82804DD055}.Debug DLL|Win32.ActiveCfg = Debug|Win32
+ {4009F58A-E333-424B-A868-7E82804DD055}.Debug DLL|Win32.Build.0 = Debug|Win32
{4009F58A-E333-424B-A868-7E82804DD055}.Debug IPv6 MSR|Win32.ActiveCfg = Debug|Win32
{4009F58A-E333-424B-A868-7E82804DD055}.Debug IPv6 MSR|Win32.Build.0 = Debug|Win32
{4009F58A-E333-424B-A868-7E82804DD055}.Debug IPv6 Musica|Win32.ActiveCfg = Debug|Win32
@@ -329,6 +401,8 @@ Global
{4009F58A-E333-424B-A868-7E82804DD055}.Debug IPv6 Win2000|Win32.Build.0 = Debug|Win32
{4009F58A-E333-424B-A868-7E82804DD055}.Debug|Win32.ActiveCfg = Debug|Win32
{4009F58A-E333-424B-A868-7E82804DD055}.Debug|Win32.Build.0 = Debug|Win32
+ {4009F58A-E333-424B-A868-7E82804DD055}.Release DLL|Win32.ActiveCfg = Release|Win32
+ {4009F58A-E333-424B-A868-7E82804DD055}.Release DLL|Win32.Build.0 = Release|Win32
{4009F58A-E333-424B-A868-7E82804DD055}.Release IPv6 Win2000|Win32.ActiveCfg = Release|Win32
{4009F58A-E333-424B-A868-7E82804DD055}.Release IPv6 Win2000|Win32.Build.0 = Release|Win32
{4009F58A-E333-424B-A868-7E82804DD055}.Release IPv6 XP|Win32.ActiveCfg = Release|Win32
@@ -339,4 +413,21 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {85255507-5D16-4218-85E2-F683BB2F04DA} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}
+ {44F46B7E-0E51-4304-9735-330DFBAB41E5} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}
+ {E85B3E1F-B671-4E84-9F09-90F61A27D783} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}
+ {4009F58A-E333-424B-A868-7E82804DD055} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}
+ {96A714AE-BE53-4EFF-8569-C3809AD4F3B6} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}
+ {4EA67539-9EE9-4065-BD39-87E517FD8262} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}
+ {40D9233D-E463-4DD6-AB34-47BC3BFBED19} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
+ {E1794405-29D4-466D-9BE3-DD2344C2A663} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
+ {FE3540C5-3303-46E0-A69E-D92F775687F1} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
+ {2988EB83-785F-45D4-8731-8E1E4345177E} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
+ {45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
+ {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
+ {78100236-7CEA-4948-96CC-E8ED3160329C} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
+ {5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
+ {DCC13474-28DF-47CA-A8EB-72F8CE9A78C5} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
+ EndGlobalSection
EndGlobal
diff --git a/w32/vsnet/GetLibs.bat b/w32/vsnet/GetLibs.bat
index 72f5e35a4b..97902fa5b5 100644
--- a/w32/vsnet/GetLibs.bat
+++ b/w32/vsnet/GetLibs.bat
@@ -3,10 +3,10 @@ ECHO ****************************************************************
ECHO ************** VARIABLE SETUP *****************
ECHO ****************************************************************
-for /f %%i in ('cscript /Nologo .\tools\Fulldir.vbs .\..\..\..\..') DO SET BASEDIR=%%i
-set UTILSDIR=%BASEDIR%\src\freeswitch\platform\vsnet\Tools
+for /f %%i in ('cscript /Nologo .\tools\Fulldir.vbs .\..\..') DO SET BASEDIR=%%i
+set UTILSDIR=%BASEDIR%\w32\vsnet\Tools
set INCLUDEDIR=%BASEDIR%\include
-set LIBSRCDIR=%BASEDIR%\src
+set LIBSRCDIR=%BASEDIR%\libs
set DEBUGLIBBINDIR=%BASEDIR%\debuglib
set WGET=cscript %UTILSDIR%\wget.vbs
set TAR=%UTILSDIR%\tar.exe
@@ -19,19 +19,19 @@ set UNIX2DOS=%UTILSDIR%\unix2dos.vbs
set APRDIR=apr-1.2.2
set APRTAR=%APRDIR%.tar.gz
set APRURL=ftp://ftp.wayne.edu/apache/apr/
-set APRDESTDIR=apr
-REM set CCRTPDIR=ccrtp-1.3.5
-REM set CCRTPTAR=%CCRTPDIR%.tar.gz
-REM set CCRTPURL=ftp://ftp.gnu.org/pub/gnu/ccrtp/
-REM set CCRTPDESTDIR=ccrtp
-REM set CCPPDIR=commoncpp2-1.3.21
-REM set CCPPTAR=%CCPPDIR%.tar.gz
-REM set CCPPURL=ftp://ftp.gnu.org/gnu/commoncpp/
-REM set CCPPDESTDIR=commoncpp2
+set APRDESTDIR=%APRDIR%
+set JRTPDIR=jrtplib-3.3.0
+set JRTPTAR=%JRTPDIR%.tar.gz
+set JRTPURL=http://research.edm.luc.ac.be/jori/jrtplib/
+set JRTPDESTDIR=%JRTPDIR%
+set JTHREADDIR=jthread-1.1.2
+set JTHREADTAR=%JTHREADDIR%.tar.gz
+set JTHREADURL=http://research.edm.luc.ac.be/jori/jthread/
+set JTHREADDESTDIR=%JTHREADDIR%
set EXOSIPDIR=libeXosip-0.9.0
set EXOSIPTAR=%EXOSIPDIR%.tar.gz
set EXOSIPURL=http://www.antisip.com/download/
-set EXOSIPDESTDIR=eXosip
+set EXOSIPDESTDIR=%EXOSIPDIR%
set OSIPDIR=libosip2-2.2.1
set OSIPTAR=%OSIPDIR%.tar.gz
set OSIPURL=http://www.antisip.com/download/
@@ -40,7 +40,7 @@ set OSIPDESTDIR=libosip2-2.2.0
IF NOT EXIST %INCLUDEDIR% md %INCLUDEDIR%
IF NOT EXIST %DEBUGLIBBINDIR% md %DEBUGLIBBINDIR%
IF NOT EXIST %LIBSRCDIR% md %LIBSRCDIR%
-cd %LIBSRCDIR%
+
ECHO ****************************************************************
ECHO ************** DOWNLOADS *****************
@@ -51,9 +51,12 @@ IF NOT EXIST %TAR% %WGET% %TARURL2% %UTILSDIR%
IF NOT EXIST %GUNZIP% %WGET% %GUNZIPURL% %UTILSDIR%
IF NOT EXIST %GUNZIP% %WGET% %GUNZIPURL2% %UTILSDIR%
+cd %LIBSRCDIR%
IF NOT EXIST %APRTAR% IF NOT EXIST %APRDESTDIR% %WGET% %APRURL%%APRTAR% & %GUNZIP% < %APRTAR% | %TAR% xvf - & ren %APRDIR% %APRDESTDIR% & del %APRTAR%
IF NOT EXIST %EXOSIPTAR% IF NOT EXIST %EXOSIPDESTDIR% %WGET% %EXOSIPURL%%EXOSIPTAR% & %GUNZIP% < %EXOSIPTAR% | %TAR% xvf - & ren %EXOSIPDIR% %EXOSIPDESTDIR% & del %EXOSIPTAR%
IF NOT EXIST %OSIPTAR% IF NOT EXIST %OSIPDESTDIR% %WGET% %OSIPURL%%OSIPTAR% & %GUNZIP% < %OSIPTAR% | %TAR% xvf - & ren %OSIPDIR% %OSIPDESTDIR% & del %OSIPTAR%
+IF NOT EXIST %JTHREADTAR% IF NOT EXIST %JTHREADDESTDIR% %WGET% %JTHREADURL%%JTHREADTAR% & %GUNZIP% < %JTHREADTAR% | %TAR% xvf - & ren %JTHREADDIR% %JTHREADDESTDIR% & del %JTHREADTAR%
+IF NOT EXIST %JRTPTAR% IF NOT EXIST %JRTPDESTDIR% %WGET% %JRTPURL%%JRTPTAR% & %GUNZIP% < %JRTPTAR% | %TAR% xvf - & ren %JRTPDIR% %JRTPDESTDIR% & del %JRTPTAR%
ECHO ****************************************************************
@@ -90,6 +93,7 @@ IF NOT EXIST libapr.vcproj cscript %UTILSDIR%\upgrade.vbs libapr.dsp libapr.vcpr
REM %DEVENV% libapr.vcproj /build Release
copy %LIBSRCDIR%\%APRDESTDIR%\debug\*.lib %DEBUGLIBBINDIR%
copy %LIBSRCDIR%\%APRDESTDIR%\debug\*.dll %DEBUGLIBBINDIR%
+cd %LIBSRCDIR%
ECHO ****************************************************************
ECHO ************** OSIP BUILD *****************
@@ -117,8 +121,13 @@ IF NOT EXIST %INCLUDEDIR%\eXosip copy "%LIBSRCDIR%\%EXOSIPDESTDIR%\include\eXosi
REM %DEVENV% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\windows\eXosip.vcproj /build Release
copy %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\windows\debug\*.lib %DEBUGLIBBINDIR%
+ECHO ****************************************************************
+ECHO ************** JRTP BUILD *****************
+ECHO ****************************************************************
+
+%DEVENV% %LIBSRCDIR%\jrtp4c\jrtp4c.sln /build Debug
:END
-cd %BASEDIR%
+cd %UTILSDIR%\..
diff --git a/w32/vsnet/mod_exosip.vcproj b/w32/vsnet/mod_exosip.vcproj
index 55fdcdd926..7d902f3eb0 100644
--- a/w32/vsnet/mod_exosip.vcproj
+++ b/w32/vsnet/mod_exosip.vcproj
@@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/D _CRT_SECURE_NO_DEPRECATE"
Optimization="0"
- AdditionalIncludeDirectories="..\..\src\include;"$(InputDir)..\..\..\libs\apr-1.2.2\include";..\..\..\eXosip\include;..\..\..\osip\include;..\..\..\jrtp4c\src"
+ AdditionalIncludeDirectories="..\..\src\include;"$(InputDir)..\..\..\libs\apr-1.2.2\include";"..\..\libs\libeXosip-0.9.0\include";"..\..\libs\libosip2-2.2.0\include";..\..\libs\jrtp4c\src"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
GeneratePreprocessedFile="0"
MinimalRebuild="true"
@@ -128,7 +128,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(InputDir)..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\libs\apr-1.2.2\include";"$(InputDir)libs\eXosip\include";"$(InputDir)libs\osip\include";"$(InputDir)libs\common\src""
+ AdditionalIncludeDirectories="..\..\src\include;"$(InputDir)..\..\..\libs\apr-1.2.2\include";"..\..\libs\libeXosip-0.9.0\include";"..\..\libs\libosip2-2.2.0\include";..\..\libs\jrtp4c\src"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
@@ -147,7 +147,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="Ws2_32.lib Iphlpapi.lib"
+ AdditionalDependencies="Ws2_32.lib Iphlpapi.lib libcpmt.lib"
OutputFile="$(OutDir)/mod/mod_exosip.dll"
LinkIncremental="1"
GenerateDebugInformation="true"
@@ -189,15 +189,15 @@
/>
<ProjectReference
ReferencedProjectIdentifier="{4EA67539-9EE9-4065-BD39-87E517FD8262}"
- RelativePathToProject="..\..\..\eXosip\platform\vsnet\eXosip.vcproj"
+ RelativePathToProject="..\..\libs\libeXosip-0.9.0\platform\windows\eXosip.vcproj"
/>
<ProjectReference
ReferencedProjectIdentifier="{85255507-5D16-4218-85E2-F683BB2F04DA}"
- RelativePathToProject="..\..\..\osip\platform\vsnet\osip2.vcproj"
+ RelativePathToProject="..\..\libs\libosip2-2.2.0\platform\vsnet\osip2.vcproj"
/>
<ProjectReference
ReferencedProjectIdentifier="{44F46B7E-0E51-4304-9735-330DFBAB41E5}"
- RelativePathToProject="..\..\..\osip\platform\vsnet\osipparser2.vcproj"
+ RelativePathToProject="..\..\libs\libosip2-2.2.0\platform\vsnet\osipparser2.vcproj"
/>
</References>
<Files>