More win32 build cleanups

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

diff --git a/libs/jrtp4c/w32/jrtp4c.vcproj b/libs/jrtp4c/w32/jrtp4c.vcproj
index d9858e7c75401be5c1a0b30c977e1cf48416f008..097cc3dfb47c70da1cdd0d4b008a64a7fa8b93a5 100644 (file)
--- a/libs/jrtp4c/w32/jrtp4c.vcproj
+++ b/libs/jrtp4c/w32/jrtp4c.vcproj
@@ -39,7 +39,7 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/D WIN32"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=""$(ProjectDir)..\..\jthread-1.1.2\src";"$(ProjectDir)..\..\jrtplib-3.3.0\src";"$(ProjectDir)..\src""\r
+                               AdditionalIncludeDirectories=""$(ProjectDir)..\..\jthread-1.1.2\src";"$(ProjectDir)..\..\jrtplib\src";"$(ProjectDir)..\src""\r
                                RuntimeLibrary="1"\r
                        />\r
                        <Tool\r
@@ -93,7 +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
+                               AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\jthread-1.1.2\src&quot;;&quot;$(ProjectDir)..\..\jrtplib\src&quot;;&quot;$(ProjectDir)..\src&quot;"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r

diff --git a/src/mod/mod_exosip/mod_exosip.c b/src/mod/mod_exosip/mod_exosip.c
index 31c097107e1cc4d51b1485b6f655ace9fbb48265..6beda2d9809cc4759b5537bb940ce2cf65034f4b 100644 (file)
--- 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 <eXosip/eXosip.h>
+#include <eXosip2/eXosip.h>
 #include <osip2/osip_mt.h>
 #include <osipparser2/osip_rfc3264.h>
 #include <osipparser2/osip_port.h>

diff --git a/w32/vsnet/FreeSwitchConsole.vcproj b/w32/vsnet/FreeSwitchConsole.vcproj
index a181ce866e12e623b5c31f984aa03aab0362714d..9a62c3ff186f16a0ce7d45e28ee823e8c55f8bfe 100644 (file)
--- a/w32/vsnet/FreeSwitchConsole.vcproj
+++ b/w32/vsnet/FreeSwitchConsole.vcproj
@@ -4,6 +4,7 @@
        Version="8.00"\r
        Name="FreeSwitchConsole"\r
        ProjectGUID="{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}"\r
+       RootNamespace="FreeSwitchConsole"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
@@ -40,7 +41,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="$(InputDir)include;$(InputDir)..\libs\apr-1.2.2\include"\r
+                               AdditionalIncludeDirectories="$(InputDir)include;$(InputDir)..\libs\apr\include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -118,7 +119,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(InputDir)include;$(InputDir)..\libs\apr-1.2.2\include"\r
+                               AdditionalIncludeDirectories="$(InputDir)include;$(InputDir)..\libs\apr\include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
                                RuntimeLibrary="0"\r
                                UsePrecompiledHeader="0"\r

diff --git a/w32/vsnet/FreeSwitchCore.vcproj b/w32/vsnet/FreeSwitchCore.vcproj
index 5d4016226810587e7c67350ca951c19c6b44aa0f..ae6f31498fb6a6534c79eb1a6b4ab87d469a53b4 100644 (file)
--- a/w32/vsnet/FreeSwitchCore.vcproj
+++ b/w32/vsnet/FreeSwitchCore.vcproj
@@ -41,7 +41,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\src\include;&quot;..\..\libs\apr-1.2.2\include&quot;"\r
+                               AdditionalIncludeDirectories="..\..\src\include;&quot;..\..\libs\apr\include&quot;"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -122,7 +122,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\src\include;&quot;..\..\libs\apr-1.2.2\include&quot;"\r
+                               AdditionalIncludeDirectories="..\..\src\include;&quot;..\..\libs\apr\include&quot;"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS"\r
                                RuntimeLibrary="0"\r
                                UsePrecompiledHeader="0"\r

diff --git a/w32/vsnet/Freeswitch.sln b/w32/vsnet/Freeswitch.sln
index 5e4aecd9ea8859847efc9389c8343da9e4295e58..5d61c0fe6a89f7fc83e360f0cc53ca77ccc60f66 100644 (file)
--- a/w32/vsnet/Freeswitch.sln
+++ b/w32/vsnet/Freeswitch.sln
@@ -65,14 +65,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_woomerachan", "mod_woom
 EndProject\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", "..\..\libs\libosip2-2.2.0\platform\vsnet\osip2.vcproj", "{85255507-5D16-4218-85E2-F683BB2F04DA}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osip2", "..\..\libs\osip\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", "..\..\libs\libosip2-2.2.0\platform\vsnet\osipparser2.vcproj", "{44F46B7E-0E51-4304-9735-330DFBAB41E5}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osipparser2", "..\..\libs\osip\platform\vsnet\osipparser2.vcproj", "{44F46B7E-0E51-4304-9735-330DFBAB41E5}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eXosip", "..\..\libs\libeXosip-0.9.0\platform\windows\eXosip.vcproj", "{4EA67539-9EE9-4065-BD39-87E517FD8262}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eXosip", "..\..\libs\libeXosip2\platform\vsnet\eXosip.vcproj", "{4EA67539-9EE9-4065-BD39-87E517FD8262}"\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtp4c", "..\..\libs\jrtp4c\w32\jrtp4c.vcproj", "{E85B3E1F-B671-4E84-9F09-90F61A27D783}"\r
        ProjectSection(ProjectDependencies) = postProject\r
@@ -337,8 +337,8 @@ Global
                {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 DLL|Win32.ActiveCfg = Debug|Win32\r
+               {4EA67539-9EE9-4065-BD39-87E517FD8262}.Debug DLL|Win32.Build.0 = Debug|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
@@ -347,8 +347,8 @@ 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 DLL|Win32.ActiveCfg = Release|Win32\r
+               {4EA67539-9EE9-4065-BD39-87E517FD8262}.Release DLL|Win32.Build.0 = Release|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
@@ -414,20 +414,20 @@ Global
                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
+               {DCC13474-28DF-47CA-A8EB-72F8CE9A78C5} = {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
+               {FE3540C5-3303-46E0-A69E-D92F775687F1} = {AC923B27-D665-490E-94F5-FA40E1607FB6}\r
+               {40D9233D-E463-4DD6-AB34-47BC3BFBED19} = {AC923B27-D665-490E-94F5-FA40E1607FB6}\r
+               {E1794405-29D4-466D-9BE3-DD2344C2A663} = {AC923B27-D665-490E-94F5-FA40E1607FB6}\r
+               {44F46B7E-0E51-4304-9735-330DFBAB41E5} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}\r
+               {4EA67539-9EE9-4065-BD39-87E517FD8262} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}\r
+               {E85B3E1F-B671-4E84-9F09-90F61A27D783} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}\r
+               {96A714AE-BE53-4EFF-8569-C3809AD4F3B6} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}\r
+               {4009F58A-E333-424B-A868-7E82804DD055} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}\r
+               {85255507-5D16-4218-85E2-F683BB2F04DA} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}\r
        EndGlobalSection\r
 EndGlobal\r

diff --git a/w32/vsnet/GetLibs.bat b/w32/vsnet/GetLibs.bat
index 97902fa5b59b8bf0163f2cb3a82db686c34f5942..7c8dce04b94f5f2d497a98568710c77435be1e4a 100644 (file)
--- a/w32/vsnet/GetLibs.bat
+++ b/w32/vsnet/GetLibs.bat
@@ -19,23 +19,23 @@ 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=%APRDIR%\r
+set APRDESTDIR=apr\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 JRTPDESTDIR=jrtplib\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 EXOSIPDIR=libeXosip2-1.9.1-pre17\r
 set EXOSIPTAR=%EXOSIPDIR%.tar.gz\r
 set EXOSIPURL=http://www.antisip.com/download/\r
-set EXOSIPDESTDIR=%EXOSIPDIR%\r
+set EXOSIPDESTDIR=libeXosip2\r
 set OSIPDIR=libosip2-2.2.1\r
 set OSIPTAR=%OSIPDIR%.tar.gz\r
 set OSIPURL=http://www.antisip.com/download/\r
-set OSIPDESTDIR=libosip2-2.2.0\r
+set OSIPDESTDIR=osip\r
 \r
 IF NOT EXIST %INCLUDEDIR% md %INCLUDEDIR%\r
 IF NOT EXIST %DEBUGLIBBINDIR% md %DEBUGLIBBINDIR%\r
@@ -51,12 +51,11 @@ 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
+IF NOT EXIST %LIBSRCDIR%\%APRTAR% IF NOT EXIST %LIBSRCDIR%\%APRDESTDIR% %WGET% %APRURL%%APRTAR% %LIBSRCDIR% & %GUNZIP% < %LIBSRCDIR%\%APRTAR% | %TAR% xvf - & ren %LIBSRCDIR%\%APRDIR% %APRDESTDIR% & del %LIBSRCDIR%\%APRTAR%\r
+IF NOT EXIST %LIBSRCDIR%\%EXOSIPTAR% IF NOT EXIST %LIBSRCDIR%\%EXOSIPDESTDIR% %WGET% %EXOSIPURL%%EXOSIPTAR% %LIBSRCDIR% & %GUNZIP% < %LIBSRCDIR%\%EXOSIPTAR% | %TAR% xvf - & ren %LIBSRCDIR%\%EXOSIPDIR% %EXOSIPDESTDIR% & del %LIBSRCDIR%\%EXOSIPTAR%\r
+IF NOT EXIST %LIBSRCDIR%\%OSIPTAR% IF NOT EXIST %LIBSRCDIR%\%OSIPDESTDIR% %WGET% %OSIPURL%%OSIPTAR% %LIBSRCDIR% & %GUNZIP% < %LIBSRCDIR%\%OSIPTAR% | %TAR% xvf - & ren %LIBSRCDIR%\%OSIPDIR% %OSIPDESTDIR% & del %LIBSRCDIR%\%OSIPTAR%\r
+IF NOT EXIST %LIBSRCDIR%\%JTHREADTAR% IF NOT EXIST %LIBSRCDIR%\%JTHREADDESTDIR% %WGET% %JTHREADURL%%JTHREADTAR% %LIBSRCDIR% & %GUNZIP% < %LIBSRCDIR%\%JTHREADTAR% | %TAR% xvf - & ren %LIBSRCDIR%\%JTHREADDIR% %JTHREADDESTDIR% & del %LIBSRCDIR%\%JTHREADTAR%\r
+IF NOT EXIST %LIBSRCDIR%\%JRTPTAR% IF NOT EXIST %LIBSRCDIR%\%JRTPDESTDIR% %WGET% %JRTPURL%%JRTPTAR% %LIBSRCDIR% & %GUNZIP% < %LIBSRCDIR%\%JRTPTAR% | %TAR% xvf - & ren %LIBSRCDIR%\%JRTPDIR% %JRTPDESTDIR% & del %LIBSRCDIR%\%JRTPTAR%\r
 \r
 \r
 ECHO ****************************************************************\r
@@ -84,48 +83,33 @@ ECHO ****************************************************************
 ECHO **************             APR BUILD           *****************\r
 ECHO ****************************************************************\r
 \r
-cd %APRDESTDIR%\r
-IF NOT EXIST %INCLUDEDIR%\apr.h copy %LIBSRCDIR%\%APRDESTDIR%\include\*.h %INCLUDEDIR%\r
-IF NOT EXIST %INCLUDEDIR%\apr.h copy %LIBSRCDIR%\%APRDESTDIR%\include\apr.hw %INCLUDEDIR%\apr.h\r
-IF NOT EXIST libapr.vcproj %UNIX2DOS% libapr.dsp\r
-IF NOT EXIST libapr.vcproj cscript %UTILSDIR%\upgrade.vbs libapr.dsp libapr.vcproj\r
-%DEVENV% libapr.vcproj /build Debug\r
-REM %DEVENV% libapr.vcproj /build Release\r
-copy %LIBSRCDIR%\%APRDESTDIR%\debug\*.lib %DEBUGLIBBINDIR%\r
-copy %LIBSRCDIR%\%APRDESTDIR%\debug\*.dll %DEBUGLIBBINDIR%\r
-cd %LIBSRCDIR%\r
+IF NOT EXIST %LIBSRCDIR%\%APRDESTDIR%\libapr.vcproj %UNIX2DOS% %LIBSRCDIR%\%APRDESTDIR%\libapr.dsp\r
+IF NOT EXIST %LIBSRCDIR%\%APRDESTDIR%\libapr.vcproj cscript %UTILSDIR%\upgrade.vbs %LIBSRCDIR%\%APRDESTDIR%\libapr.dsp %LIBSRCDIR%\%APRDESTDIR%\libapr.vcproj\r
+%DEVENV% %LIBSRCDIR%\%APRDESTDIR%\libapr.vcproj /build Debug\r
+\r
 \r
 ECHO ****************************************************************\r
 ECHO **************            OSIP BUILD           *****************\r
 ECHO ****************************************************************\r
 \r
-IF NOT EXIST %INCLUDEDIR%\osip2 md %INCLUDEDIR%\osip2\r
-IF NOT EXIST %INCLUDEDIR%\osipparser2 md %INCLUDEDIR%\osipparser2\r
-IF NOT EXIST %INCLUDEDIR%\osip2\osip.h copy %LIBSRCDIR%\%OSIPDESTDIR%\include\osip2\*.h %INCLUDEDIR%\osip2\r
-IF NOT EXIST %INCLUDEDIR%\osipparser2\osip_parser.h copy %LIBSRCDIR%\%OSIPDESTDIR%\include\osipparser2\*.h %INCLUDEDIR%\osipparser2\r
+del %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\osipparser2.vcproj\r
+copy %UTILSDIR%\osipparser2.vcproj %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\\r
 %DEVENV% %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\osip.sln /Upgrade\r
 %DEVENV% %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\osip.sln /build Debug\r
-REM %DEVENV% %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\osip.sln /build Release\r
-copy %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\debug\*.lib %DEBUGLIBBINDIR%\r
 \r
 \r
 ECHO ****************************************************************\r
 ECHO **************          EXOSIP BUILD           *****************\r
 ECHO ****************************************************************\r
 \r
-IF NOT EXIST "%INCLUDEDIR%\eXosip" md "%INCLUDEDIR%\eXosip"\r
-IF NOT EXIST %INCLUDEDIR%\eXosip copy "%LIBSRCDIR%\%EXOSIPDESTDIR%\include\eXosip\*.h" "%INCLUDEDIR%\eXosip"\r
-%UNIX2DOS% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\windows\eXosip.vcproj\r
-%DEVENV% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\windows\eXosip.vcproj /Upgrade\r
-%DEVENV% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\windows\eXosip.vcproj /build Debug\r
-REM %DEVENV% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\windows\eXosip.vcproj /build Release\r
-copy %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\windows\debug\*.lib %DEBUGLIBBINDIR%\r
+%DEVENV% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\vsnet\eXosip.vcproj /Upgrade\r
+%DEVENV% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\vsnet\eXosip.vcproj /build Debug\r
 \r
 ECHO ****************************************************************\r
 ECHO **************           JRTP BUILD            *****************\r
 ECHO ****************************************************************\r
 \r
-%DEVENV% %LIBSRCDIR%\jrtp4c\jrtp4c.sln /build Debug\r
+%DEVENV% %LIBSRCDIR%\jrtp4c\w32\jrtp4c.sln /build Debug\r
 \r
 :END\r
 cd %UTILSDIR%\..\r

diff --git a/w32/vsnet/Tools/osipparser2.vcproj b/w32/vsnet/Tools/osipparser2.vcproj
new file mode 100644 (file)
index 0000000..50474c5
--- /dev/null
+++ b/w32/vsnet/Tools/osipparser2.vcproj
@@ -0,0 +1,476 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="osipparser2"\r
+       ProjectGUID="{44F46B7E-0E51-4304-9735-330DFBAB41E5}"\r
+       RootNamespace="osipparser2"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="Debug"\r
+                       IntermediateDirectory="Debug"\r
+                       ConfigurationType="4"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\src\osipparser2"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB;OSIP_MT;ENABLE_TRACE;SYSTEM_LOGGER_ENABLED"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="1"\r
+                               UsePrecompiledHeader="0"\r
+                               ProgramDataBaseFileName="$(OutDir)/$(ProjectName).pdb"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="$(OutDir)\osipparser2.lib"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="Release"\r
+                       IntermediateDirectory="Release"\r
+                       ConfigurationType="4"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\src\osipparser2"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB;OSIP_MT;ENABLE_TRACE;SYSTEM_LOGGER_ENABLED"\r
+                               RuntimeLibrary="0"\r
+                               UsePrecompiledHeader="0"\r
+                               ProgramDataBaseFileName="$(OutDir)/$(ProjectName).pdb"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="$(OutDir)/osipparser2.lib"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_accept.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_accept_encoding.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_accept_language.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_alert_info.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_allow.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_authentication_info.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_authorization.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_body.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_call_id.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_call_info.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_contact.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_content_disposition.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_content_encoding.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_content_length.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_content_type.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_cseq.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_error_info.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_from.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_header.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_list.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_md5c.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_message.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_message_parse.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_message_to_str.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_mime_version.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_parser_cfg.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_port.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_proxy_authenticate.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_proxy_authentication_info.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_proxy_authorization.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_record_route.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_rfc3264.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_route.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_to.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_uri.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_via.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_www_authenticate.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\sdp_accessor.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\sdp_message.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\headers\osip_accept.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\headers\osip_accept_encoding.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\headers\osip_accept_language.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\headers\osip_alert_info.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\headers\osip_allow.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\headers\osip_authorization.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\osip_body.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\headers\osip_call_id.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\headers\osip_call_info.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\osip_const.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\headers\osip_contact.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\headers\osip_content_disposition.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\headers\osip_content_encoding.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\headers\osip_content_length.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\headers\osip_content_type.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\headers\osip_cseq.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\headers\osip_error_info.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\headers\osip_from.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\headers\osip_header.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\osip_headers.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\osip_list.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\osip_md5.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\osip_message.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\headers\osip_mime_version.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\osip_parser.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\osip_port.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\headers\osip_proxy_authenticate.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\headers\osip_proxy_authorization.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\headers\osip_record_route.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\osip_rfc3264i.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\headers\osip_route.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\headers\osip_to.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\osip_uri.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\headers\osip_via.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\headers\osip_www_authenticate.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\osipparser2\parser.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\osipparser2\sdp_message.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r

diff --git a/w32/vsnet/mod_bridgecall.vcproj b/w32/vsnet/mod_bridgecall.vcproj
index 374b04e1da0c6d4726181843364df402e19b9850..05b93fa9d422efc362e46f9caca15e7e41525ab0 100644 (file)
--- a/w32/vsnet/mod_bridgecall.vcproj
+++ b/w32/vsnet/mod_bridgecall.vcproj
@@ -41,7 +41,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr-1.2.2\include"\r
+                               AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr\include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -120,7 +120,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr-1.2.2\include"\r
+                               AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr\include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                RuntimeLibrary="0"\r
                                UsePrecompiledHeader="0"\r

diff --git a/w32/vsnet/mod_dialplan_demo.vcproj b/w32/vsnet/mod_dialplan_demo.vcproj
index 0c7ae3aa019607252f268b188e9b170be4df383d..a32d7b257dd387dd5f31d052c9656d107b0ea184 100644 (file)
--- a/w32/vsnet/mod_dialplan_demo.vcproj
+++ b/w32/vsnet/mod_dialplan_demo.vcproj
@@ -4,6 +4,7 @@
        Version="8.00"\r
        Name="mod_dialplan_demo"\r
        ProjectGUID="{2988EB83-785F-45D4-8731-8E1E4345177E}"\r
+       RootNamespace="mod_dialplan_demo"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
@@ -40,7 +41,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr-1.2.2\include"\r
+                               AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr\include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -119,7 +120,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr-1.2.2\include"\r
+                               AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr\include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                RuntimeLibrary="0"\r
                                UsePrecompiledHeader="0"\r

diff --git a/w32/vsnet/mod_exosip.vcproj b/w32/vsnet/mod_exosip.vcproj
index 7d902f3eb07878971cae78af349a02155f58cd7b..c0cb8b1f4348ea10ae5b4377f87f5fe5e2a75b2d 100644 (file)
--- a/w32/vsnet/mod_exosip.vcproj
+++ b/w32/vsnet/mod_exosip.vcproj
@@ -42,7 +42,7 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/D _CRT_SECURE_NO_DEPRECATE"\r
                                Optimization="0"\r
-                               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"\r
+                               AdditionalIncludeDirectories="..\..\src\include;"$(InputDir)..\..\..\libs\apr\include";..\..\libs\libeXosip2\include;..\..\libs\osip\include;..\..\libs\jrtp4c\src"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                GeneratePreprocessedFile="0"\r
                                MinimalRebuild="true"\r
@@ -128,7 +128,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\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
+                               AdditionalIncludeDirectories="..\..\src\include;&quot;$(InputDir)..\..\..\libs\apr\include&quot;;..\..\libs\libeXosip2\include;..\..\libs\osip\include;..\..\libs\jrtp4c\src"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                RuntimeLibrary="0"\r
                                UsePrecompiledHeader="0"\r
@@ -189,15 +189,15 @@
                />\r
                <ProjectReference\r
                        ReferencedProjectIdentifier="{4EA67539-9EE9-4065-BD39-87E517FD8262}"\r
-                       RelativePathToProject="..\..\libs\libeXosip-0.9.0\platform\windows\eXosip.vcproj"\r
+                       RelativePathToProject="..\..\libs\libeXosip2\platform\vsnet\eXosip.vcproj"\r
                />\r
                <ProjectReference\r
                        ReferencedProjectIdentifier="{85255507-5D16-4218-85E2-F683BB2F04DA}"\r
-                       RelativePathToProject="..\..\libs\libosip2-2.2.0\platform\vsnet\osip2.vcproj"\r
+                       RelativePathToProject="..\..\libs\osip\platform\vsnet\osip2.vcproj"\r
                />\r
                <ProjectReference\r
                        ReferencedProjectIdentifier="{44F46B7E-0E51-4304-9735-330DFBAB41E5}"\r
-                       RelativePathToProject="..\..\libs\libosip2-2.2.0\platform\vsnet\osipparser2.vcproj"\r
+                       RelativePathToProject="..\..\libs\osip\platform\vsnet\osipparser2.vcproj"\r
                />\r
        </References>\r
        <Files>\r

diff --git a/w32/vsnet/mod_g711codec.vcproj b/w32/vsnet/mod_g711codec.vcproj
index 08ea808a5298f85b463cf255d3e9b469fd443ea2..9d74fd6b97753c04a0a2e68cd8c3ad7cc019718a 100644 (file)
--- a/w32/vsnet/mod_g711codec.vcproj
+++ b/w32/vsnet/mod_g711codec.vcproj
@@ -4,6 +4,7 @@
        Version="8.00"\r
        Name="mod_g711codec"\r
        ProjectGUID="{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}"\r
+       RootNamespace="mod_g711codec"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
@@ -40,7 +41,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr-1.2.2\include"\r
+                               AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr\include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -119,7 +120,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr-1.2.2\include"\r
+                               AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr\include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                RuntimeLibrary="0"\r
                                UsePrecompiledHeader="0"\r

diff --git a/w32/vsnet/mod_playback.vcproj b/w32/vsnet/mod_playback.vcproj
index 19ed73c5a3251f7cb57d002bda49eca6584a21cf..dde2d9924f1345411d03780dbf251382d8dbddde 100644 (file)
--- a/w32/vsnet/mod_playback.vcproj
+++ b/w32/vsnet/mod_playback.vcproj
@@ -4,6 +4,7 @@
        Version="8.00"\r
        Name="mod_playback"\r
        ProjectGUID="{78100236-7CEA-4948-96CC-E8ED3160329C}"\r
+       RootNamespace="mod_playback"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
@@ -40,7 +41,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr-1.2.2\include"\r
+                               AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr\include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -119,7 +120,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr-1.2.2\include"\r
+                               AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr\include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                RuntimeLibrary="0"\r
                                UsePrecompiledHeader="0"\r

diff --git a/w32/vsnet/mod_rawaudio.vcproj b/w32/vsnet/mod_rawaudio.vcproj
index 6d84a5d59b064bee096aafb16739cf3ddfb1deae..a537ab2c6c2aedfa76161536e4f16b1be7d68a25 100644 (file)
--- a/w32/vsnet/mod_rawaudio.vcproj
+++ b/w32/vsnet/mod_rawaudio.vcproj
@@ -4,6 +4,7 @@
        Version="8.00"\r
        Name="mod_rawaudio"\r
        ProjectGUID="{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}"\r
+       RootNamespace="mod_rawaudio"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
@@ -40,7 +41,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr-1.2.2\include"\r
+                               AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr\include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -119,7 +120,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr-1.2.2\include"\r
+                               AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr\include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                RuntimeLibrary="0"\r
                                UsePrecompiledHeader="0"\r

diff --git a/w32/vsnet/mod_softtimer.vcproj b/w32/vsnet/mod_softtimer.vcproj
index c5134fd54a47173e616be11ba5fc331102bb4068..48dd71d89b24c00a185e116878dc692cb37be50f 100644 (file)
--- a/w32/vsnet/mod_softtimer.vcproj
+++ b/w32/vsnet/mod_softtimer.vcproj
@@ -4,6 +4,7 @@
        Version="8.00"\r
        Name="mod_softtimer"\r
        ProjectGUID="{DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}"\r
+       RootNamespace="mod_softtimer"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
@@ -40,7 +41,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr-1.2.2\include"\r
+                               AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr\include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -119,7 +120,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr-1.2.2\include"\r
+                               AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr\include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                RuntimeLibrary="0"\r
                                UsePrecompiledHeader="0"\r

diff --git a/w32/vsnet/mod_woomerachan.vcproj b/w32/vsnet/mod_woomerachan.vcproj
index b67917281e8f64a06e915601f0222e61c6c29730..189148c042fb26d235ef3a12a9d665460d494332 100644 (file)
--- a/w32/vsnet/mod_woomerachan.vcproj
+++ b/w32/vsnet/mod_woomerachan.vcproj
@@ -4,6 +4,7 @@
        Version="8.00"\r
        Name="mod_woomerachan"\r
        ProjectGUID="{FE3540C5-3303-46E0-A69E-D92F775687F1}"\r
+       RootNamespace="mod_woomerachan"\r
        Keyword="Win32Proj"\r
        >\r
        <Platforms>\r
@@ -40,7 +41,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr-1.2.2\include"\r
+                               AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr\include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -119,7 +120,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr-1.2.2\include"\r
+                               AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr\include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                RuntimeLibrary="0"\r
                                UsePrecompiledHeader="0"\r