]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
freeswitch win32 reorg and cleanup part 1. Everything works but mod_exosip
authorMichael Jerris <mike@jerris.com>
Sat, 19 Nov 2005 22:18:34 +0000 (22:18 +0000)
committerMichael Jerris <mike@jerris.com>
Sat, 19 Nov 2005 22:18:34 +0000 (22:18 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@56 d0543943-73ff-0310-b7d9-9358b9ac24b2

libs/jrtp4c/w32/jrtp4c.sln [moved from libs/jrtp4c/w32/msvc/jrtp4c.sln with 85% similarity]
libs/jrtp4c/w32/jrtp4c.vcproj [moved from libs/jrtp4c/w32/jrtp4c/jrtp4c.vcproj with 82% similarity]
src/mod/mod_exosip/mod_exosip.c
w32/vsnet/FreeSwitchCore.vcproj
w32/vsnet/Freeswitch.sln
w32/vsnet/GetLibs.bat
w32/vsnet/mod_exosip.vcproj

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