[Freeswitch-svn] [commit] r3740 - in freeswitch/trunk: . libs/win32/apr libs/win32/apr-util libs/win32/pcre

Freeswitch SVN mikej at freeswitch.org
Tue Dec 19 17:39:39 EST 2006


Author: mikej
Date: Tue Dec 19 17:39:38 2006
New Revision: 3740

Modified:
   freeswitch/trunk/Freeswitch.sln
   freeswitch/trunk/libs/win32/apr-util/libaprutil.vcproj
   freeswitch/trunk/libs/win32/apr-util/xml.vcproj
   freeswitch/trunk/libs/win32/apr/libapr.vcproj
   freeswitch/trunk/libs/win32/pcre/libpcre.vcproj
   freeswitch/trunk/libs/win32/pcre/pcre_chartables.c.vcproj

Log:
move windows build to use the in tree apr, apr-util and pcre

Modified: freeswitch/trunk/Freeswitch.sln
==============================================================================
--- freeswitch/trunk/Freeswitch.sln	(original)
+++ freeswitch/trunk/Freeswitch.sln	Tue Dec 19 17:39:38 2006
@@ -3,22 +3,22 @@
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchConsole", "w32\Console\FreeSwitchConsole.vcproj", "{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}"
 	ProjectSection(ProjectDependencies) = postProject
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchCoreLib", "w32\Library\FreeSwitchCore.vcproj", "{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}"
 	ProjectSection(ProjectDependencies) = postProject
-		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EEF031CB-FED8-451E-A471-91EC8D4F6750}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
-		{89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C}
-		{8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9}
 		{50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} = {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}
+		{8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9}
+		{89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EEF031CB-FED8-451E-A471-91EC8D4F6750}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
+		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g729", "src\mod\codecs\mod_g729\mod_g729.vcproj", "{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}"
@@ -28,42 +28,42 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_gsm", "src\mod\codecs\mod_gsm\mod_gsm.vcproj", "{4926323F-4EA8-4B7D-A3D3-65488725988F}"
 	ProjectSection(ProjectDependencies) = postProject
-		{8FD2E297-4096-47E5-9258-C48FF1841523} = {8FD2E297-4096-47E5-9258-C48FF1841523}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{8FD2E297-4096-47E5-9258-C48FF1841523} = {8FD2E297-4096-47E5-9258-C48FF1841523}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xmpp_event", "src\mod\event_handlers\mod_xmpp_event\mod_xmpp_event.vcproj", "{F10BE67C-A8FF-4CB2-AF29-D46D2590DC59}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E727E8F6-935D-46FE-8B0E-37834748A0E3} = {E727E8F6-935D-46FE-8B0E-37834748A0E3}
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
+		{E727E8F6-935D-46FE-8B0E-37834748A0E3} = {E727E8F6-935D-46FE-8B0E-37834748A0E3}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sndfile", "src\mod\formats\mod_sndfile\mod_sndfile.vcproj", "{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}"
 	ProjectSection(ProjectDependencies) = postProject
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{3D0370CA-BED2-4657-A475-32375CBCB6E4} = {3D0370CA-BED2-4657-A475-32375CBCB6E4}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{3D0370CA-BED2-4657-A475-32375CBCB6E4} = {3D0370CA-BED2-4657-A475-32375CBCB6E4}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_bridgecall", "src\mod\applications\mod_bridgecall\mod_bridgecall.vcproj", "{E1794405-29D4-466D-9BE3-DD2344C2A663}"
 	ProjectSection(ProjectDependencies) = postProject
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_test", "src\mod\event_handlers\mod_event_test\mod_event_test.vcproj", "{3A2A7795-C216-4FFF-B8EF-4D17A84BACCC}"
 	ProjectSection(ProjectDependencies) = postProject
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g711", "src\mod\codecs\mod_g711\mod_g711.vcproj", "{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}"
@@ -73,28 +73,28 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_iax", "src\mod\endpoints\mod_iax\mod_iax.vcproj", "{3A5B9131-F20C-4A85-9447-6C1610941CEE}"
 	ProjectSection(ProjectDependencies) = postProject
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} = {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} = {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_playback", "src\mod\applications\mod_playback\mod_playback.vcproj", "{78100236-7CEA-4948-96CC-E8ED3160329C}"
 	ProjectSection(ProjectDependencies) = postProject
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_PortAudio", "src\mod\endpoints\mod_portaudio\mod_PortAudio.vcproj", "{5FD31A25-5D83-4794-8BEE-904DAD84CE71}"
 	ProjectSection(ProjectDependencies) = postProject
-		{C30D35E4-7FC6-4E97-9BE5-4BC077BE0D4B} = {C30D35E4-7FC6-4E97-9BE5-4BC077BE0D4B}
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
+		{C30D35E4-7FC6-4E97-9BE5-4BC077BE0D4B} = {C30D35E4-7FC6-4E97-9BE5-4BC077BE0D4B}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_l16", "src\mod\codecs\mod_l16\mod_l16.vcproj", "{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}"
@@ -104,24 +104,24 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_softtimer", "src\mod\timers\mod_softtimer\mod_softtimer.vcproj", "{DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}"
 	ProjectSection(ProjectDependencies) = postProject
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_speex", "src\mod\codecs\mod_speex\mod_speex.vcproj", "{5580D60E-0F77-4716-9CD4-B8E5986FA375}"
 	ProjectSection(ProjectDependencies) = postProject
-		{1C469CDD-A3AF-4A94-A592-B2CF12F2D918} = {1C469CDD-A3AF-4A94-A592-B2CF12F2D918}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{1C469CDD-A3AF-4A94-A592-B2CF12F2D918} = {1C469CDD-A3AF-4A94-A592-B2CF12F2D918}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_woomera", "src\mod\endpoints\mod_woomera\mod_woomera.vcproj", "{FE3540C5-3303-46E0-A69E-D92F775687F1}"
 	ProjectSection(ProjectDependencies) = postProject
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Codecs", "Codecs", "{F881ADA2-2F1A-4046-9FEB-191D9422D781}"
@@ -144,19 +144,19 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dialplan_xml", "src\mod\dialplans\mod_dialplan_xml\mod_dialplan_xml.vcproj", "{07113B25-D3AF-4E04-BA77-4CD1171F022C}"
 	ProjectSection(ProjectDependencies) = postProject
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
-		{8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_ivrtest", "src\mod\applications\mod_ivrtest\mod_ivrtest.vcproj", "{419AA391-5F3F-4BFE-A869-9D154D62A792}"
 	ProjectSection(ProjectDependencies) = postProject
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
 	EndProjectSection
 EndProject
 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "FreeSwitchSetup", "w32\Setup\Setup.vdproj", "{B17FFBE6-A942-4056-8346-B624FB5D995B}"
@@ -170,28 +170,28 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dialplan_directory", "src\mod\dialplans\mod_dialplan_directory\mod_dialplan_directory.vcproj", "{A27CCA23-1541-4337-81A4-F0A6413078A0}"
 	ProjectSection(ProjectDependencies) = postProject
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_zeroconf", "src\mod\event_handlers\mod_zeroconf\mod_zeroconf.vcproj", "{C7705DC4-2088-493E-AF8D-65BC6D65C125}"
 	ProjectSection(ProjectDependencies) = postProject
-		{0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {0D826AF5-0506-4C50-BB8B-7DB019AC21AE}
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{49C34584-B6DA-448F-83CF-27584DC9FC90} = {49C34584-B6DA-448F-83CF-27584DC9FC90}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{49C34584-B6DA-448F-83CF-27584DC9FC90} = {49C34584-B6DA-448F-83CF-27584DC9FC90}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
+		{0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {0D826AF5-0506-4C50-BB8B-7DB019AC21AE}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_multicast", "src\mod\event_handlers\mod_event_multicast\mod_event_multicast.vcproj", "{784113EF-44D9-4949-835D-7065D3C7AD08}"
 	ProjectSection(ProjectDependencies) = postProject
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libteletone", "libs\libteletone\libteletone.vcproj", "{89385C74-5860-4174-9CAF-A39E7C48909C}"
@@ -200,14 +200,14 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey", "src\mod\languages\mod_spidermonkey\mod_spidermonkey.vcproj", "{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}"
 	ProjectSection(ProjectDependencies) = postProject
-		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
-		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
-		{89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
+		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
+		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ASR-TTS", "ASR-TTS", "{4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}"
@@ -229,36 +229,36 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_echo", "src\mod\applications\mod_echo\mod_echo.vcproj", "{0E2C6395-13B9-46E5-9264-8859D346018D}"
 	ProjectSection(ProjectDependencies) = postProject
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_ilbc", "src\mod\codecs\mod_ilbc\mod_ilbc.vcproj", "{D3EC0AFF-76FC-4210-A825-9A17410660A3}"
 	ProjectSection(ProjectDependencies) = postProject
-		{989BB874-7AF1-44CB-8E5C-CC8113D267E8} = {989BB874-7AF1-44CB-8E5C-CC8113D267E8}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{989BB874-7AF1-44CB-8E5C-CC8113D267E8} = {989BB874-7AF1-44CB-8E5C-CC8113D267E8}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dingaling", "src\mod\endpoints\mod_dingaling\mod_dingaling.vcproj", "{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E727E8F6-935D-46FE-8B0E-37834748A0E3} = {E727E8F6-935D-46FE-8B0E-37834748A0E3}
-		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 		{1906D736-08BD-4EE1-924F-B536249B9A54} = {1906D736-08BD-4EE1-924F-B536249B9A54}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
+		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
+		{E727E8F6-935D-46FE-8B0E-37834748A0E3} = {E727E8F6-935D-46FE-8B0E-37834748A0E3}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_commands", "src\mod\applications\mod_commands\mod_commands.vcproj", "{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}"
 	ProjectSection(ProjectDependencies) = postProject
-		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
+		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Loggers", "Loggers", "{A7AB4405-FDB7-4853-9FBB-1516B1C3D80A}"
@@ -272,56 +272,56 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_rpc", "src\mod\xml_int\mod_xml_rpc\mod_xml_rpc.vcproj", "{CBEC7225-0C21-4DA8-978E-1F158F8AD950}"
 	ProjectSection(ProjectDependencies) = postProject
-		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {155844C3-EC5F-407F-97A4-A2DDADED9B2F}
-		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
-		{A3FE0076-B366-429D-A238-D7304DA7D3C1} = {A3FE0076-B366-429D-A238-D7304DA7D3C1}
-		{356EC96D-4C9F-47B5-9083-FC328B87BA94} = {356EC96D-4C9F-47B5-9083-FC328B87BA94}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{356EC96D-4C9F-47B5-9083-FC328B87BA94} = {356EC96D-4C9F-47B5-9083-FC328B87BA94}
+		{A3FE0076-B366-429D-A238-D7304DA7D3C1} = {A3FE0076-B366-429D-A238-D7304DA7D3C1}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
+		{155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {155844C3-EC5F-407F-97A4-A2DDADED9B2F}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
+		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rss", "src\mod\applications\mod_rss\mod_rss.vcproj", "{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}"
 	ProjectSection(ProjectDependencies) = postProject
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_conference", "src\mod\applications\mod_conference\mod_conference.vcproj", "{C24FB505-05D7-4319-8485-7540B44C8603}"
 	ProjectSection(ProjectDependencies) = postProject
-		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
+		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dptools", "src\mod\applications\mod_dptools\mod_dptools.vcproj", "{B5881A85-FE70-4F64-8607-2CAAE52669C6}"
 	ProjectSection(ProjectDependencies) = postProject
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_socket", "src\mod\event_handlers\mod_event_socket\mod_event_socket.vcproj", "{05515420-16DE-4E63-BE73-85BE85BA5142}"
 	ProjectSection(ProjectDependencies) = postProject
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_cdr", "src\mod\event_handlers\mod_cdr\mod_cdr.vcproj", "{3D1EED36-A510-4EDB-B4D9-4E0F4A5EC2A8}"
 	ProjectSection(ProjectDependencies) = postProject
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Libraries", "_Libraries", "{EB910B0D-F27D-4B62-B67B-DE834C99AC5B}"
@@ -347,54 +347,27 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpcre", "libs\win32\pcre\libpcre.vcproj", "{8D04B550-D240-4A44-8A18-35DA3F7038D9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{1CED5987-A529-46DC-B30F-870D85FF9C94} = {1CED5987-A529-46DC-B30F-870D85FF9C94}
-		{91695C7C-7AD1-4782-9727-508F82D9C577} = {91695C7C-7AD1-4782-9727-508F82D9C577}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpcre Generate pcre_chartables.c", "libs\win32\pcre\pcre_chartables.c.vcproj", "{1CED5987-A529-46DC-B30F-870D85FF9C94}"
-	ProjectSection(ProjectDependencies) = postProject
-		{91695C7C-7AD1-4782-9727-508F82D9C577} = {91695C7C-7AD1-4782-9727-508F82D9C577}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libresample", "libs\win32\libresample\libresample.vcproj", "{50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libapr", "libs\win32\apr\libapr.vcproj", "{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C4854C1D-5478-4F87-AB62-36CCDDDBA3C7} = {C4854C1D-5478-4F87-AB62-36CCDDDBA3C7}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libapriconv", "libs\win32\apr-iconv\libapriconv.vcproj", "{101130D1-3EA6-4ED2-B65D-CEB5243A20ED}"
 	ProjectSection(ProjectDependencies) = postProject
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{5786D51D-1C6A-4BE1-8804-29954DB5258F} = {5786D51D-1C6A-4BE1-8804-29954DB5258F}
-		{C4854C1D-5478-4F87-AB62-36CCDDDBA3C7} = {C4854C1D-5478-4F87-AB62-36CCDDDBA3C7}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaprutil", "libs\win32\apr-util\libaprutil.vcproj", "{F057DA7F-79E5-4B00-845C-EF446EF055E3}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E969F3E0-1043-482A-AD49-787B8356BA92} = {E969F3E0-1043-482A-AD49-787B8356BA92}
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{5786D51D-1C6A-4BE1-8804-29954DB5258F} = {5786D51D-1C6A-4BE1-8804-29954DB5258F}
-		{C4854C1D-5478-4F87-AB62-36CCDDDBA3C7} = {C4854C1D-5478-4F87-AB62-36CCDDDBA3C7}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Downloads", "_Downloads", "{C120A020-773F-4EA3-923F-B67AF28B750D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download APR", "libs\win32\Download APR.vcproj", "{C4854C1D-5478-4F87-AB62-36CCDDDBA3C7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download APR-Iconv", "libs\win32\Download APR-Iconv.vcproj", "{5786D51D-1C6A-4BE1-8804-29954DB5258F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C4854C1D-5478-4F87-AB62-36CCDDDBA3C7} = {C4854C1D-5478-4F87-AB62-36CCDDDBA3C7}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download APR-Util", "libs\win32\Download APR-Util.vcproj", "{E969F3E0-1043-482A-AD49-787B8356BA92}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5786D51D-1C6A-4BE1-8804-29954DB5258F} = {5786D51D-1C6A-4BE1-8804-29954DB5258F}
-		{C4854C1D-5478-4F87-AB62-36CCDDDBA3C7} = {C4854C1D-5478-4F87-AB62-36CCDDDBA3C7}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download PCRE", "libs\win32\Download PCRE.vcproj", "{91695C7C-7AD1-4782-9727-508F82D9C577}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download SQLITE", "libs\win32\Download SQLITE.vcproj", "{6B9217D6-8259-4817-B8A5-2FEAD349EDEB}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download SPEEX", "libs\win32\Download SPEEX.vcproj", "{5C9C69D2-8B98-42DA-8D82-6E0B48446FAC}"
@@ -427,8 +400,8 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mDNSResponder static library", "libs\win32\howl\libmDNSResponder.vcproj", "{49C34584-B6DA-448F-83CF-27584DC9FC90}"
 	ProjectSection(ProjectDependencies) = postProject
-		{0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {0D826AF5-0506-4C50-BB8B-7DB019AC21AE}
 		{5927104D-C14C-4AC8-925C-4AB681762E75} = {5927104D-C14C-4AC8-925C-4AB681762E75}
+		{0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {0D826AF5-0506-4C50-BB8B-7DB019AC21AE}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download LIBSNDFILE", "libs\win32\Download LIBSNDFILE.vcproj", "{EFA9E76E-62A5-4237-B7E9-F39B8E174CD5}"
@@ -454,8 +427,8 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Abyss", "libs\win32\xmlrpc\Abyss.vcproj", "{356EC96D-4C9F-47B5-9083-FC328B87BA94}"
 	ProjectSection(ProjectDependencies) = postProject
-		{EC8D4AE8-0F3E-454A-BFB8-D56A5D9C0121} = {EC8D4AE8-0F3E-454A-BFB8-D56A5D9C0121}
 		{A3FE0076-B366-429D-A238-D7304DA7D3C1} = {A3FE0076-B366-429D-A238-D7304DA7D3C1}
+		{EC8D4AE8-0F3E-454A-BFB8-D56A5D9C0121} = {EC8D4AE8-0F3E-454A-BFB8-D56A5D9C0121}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "libs\win32\apr-util\xml.vcproj", "{155844C3-EC5F-407F-97A4-A2DDADED9B2F}"
@@ -464,52 +437,52 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sofia", "src\mod\endpoints\mod_sofia\mod_sofia.vcproj", "{0DF3ABD0-DDC0-4265-B778-07C66780979B}"
 	ProjectSection(ProjectDependencies) = postProject
-		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
+		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libg726", "libs\codec\g726\libg726.vcproj", "{5A6A281A-AA50-470A-8305-202BDA1CD1BF}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g726", "src\mod\codecs\mod_g726\mod_g726.vcproj", "{486369EB-F150-4B56-BCC8-77B9E18FF5F5}"
 	ProjectSection(ProjectDependencies) = postProject
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 		{5A6A281A-AA50-470A-8305-202BDA1CD1BF} = {5A6A281A-AA50-470A-8305-202BDA1CD1BF}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libg7xx", "libs\codec\g7xx\libg7xx.vcproj", "{D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g722", "src\mod\codecs\mod_g722\mod_g722.vcproj", "{D42518CC-7475-454D-B392-0E132C07D761}"
 	ProjectSection(ProjectDependencies) = postProject
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 		{D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} = {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_park", "src\mod\applications\mod_park\mod_park.vcproj", "{2740F45C-475A-4DE0-BCED-6E2E5F6C4B8B}"
 	ProjectSection(ProjectDependencies) = postProject
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download SOFIA", "libs\win32\Download SOFIA.vcproj", "{8B2CE7D1-77EF-45ED-927D-82147805440B}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsofia_sip_ua_static", "libs\win32\sofia\libsofia_sip_ua_static.vcproj", "{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}"
 	ProjectSection(ProjectDependencies) = postProject
-		{8B2CE7D1-77EF-45ED-927D-82147805440B} = {8B2CE7D1-77EF-45ED-927D-82147805440B}
-		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}
 		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}
+		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}
+		{8B2CE7D1-77EF-45ED-927D-82147805440B} = {8B2CE7D1-77EF-45ED-927D-82147805440B}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download PTHREAD", "libs\win32\Download PTHREAD.vcproj", "{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}"
@@ -521,71 +494,71 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g723_1", "src\mod\codecs\mod_g723_1\mod_g723_1.vcproj", "{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}"
 	ProjectSection(ProjectDependencies) = postProject
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_native_file", "src\mod\formats\mod_native_file\mod_native_file.vcproj", "{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}"
 	ProjectSection(ProjectDependencies) = postProject
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeSwitch.NET", "src\dotnet\FreeSwitch.NET.csproj", "{251CAABC-16C3-4593-A491-603B908094E0}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_core_db", "src\mod\languages\mod_spidermonkey_core_db\mod_spidermonkey_core_db.vcproj", "{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}"
 	ProjectSection(ProjectDependencies) = postProject
-		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
-		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
+		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_teletone", "src\mod\languages\mod_spidermonkey_teletone\mod_spidermonkey_teletone.vcproj", "{8F992C49-6C51-412F-B2A3-34EAB708EB65}"
 	ProjectSection(ProjectDependencies) = postProject
 		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
 		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
 		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libudns", "libs\win32\udns\libudns.vcproj", "{4043FC6A-9A30-4577-8AD5-9B233C9575D8}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_enum", "src\mod\applications\mod_enum\mod_enum.vcproj", "{71A967D5-0E99-4CEF-A587-98836EE6F2EF}"
 	ProjectSection(ProjectDependencies) = postProject
-		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
-		{4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {4043FC6A-9A30-4577-8AD5-9B233C9575D8}
-		{8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9}
+		{4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {4043FC6A-9A30-4577-8AD5-9B233C9575D8}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
+		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_etpan", "src\mod\languages\mod_spidermonkey_etpan\mod_spidermonkey_etpan.vcproj", "{D6C82F86-2B05-4A7F-8CC6-D2592E66FBB9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
+		{BA4DED3C-E56F-4484-BFC3-9C13E461A1BE} = {BA4DED3C-E56F-4484-BFC3-9C13E461A1BE}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
 		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
 		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
-		{BA4DED3C-E56F-4484-BFC3-9C13E461A1BE} = {BA4DED3C-E56F-4484-BFC3-9C13E461A1BE}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_odbc", "src\mod\languages\mod_spidermonkey_odbc\mod_spidermonkey_odbc.vcproj", "{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}"
 	ProjectSection(ProjectDependencies) = postProject
-		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
 		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
+		{204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download ETPAN", "libs\win32\Download ETPAN.vcproj", "{EAE4F6B7-B1E3-4975-8580-481E47A9BEAB}"
@@ -597,12 +570,12 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_curl", "src\mod\xml_int\mod_xml_curl\mod_xml_curl.vcproj", "{AB91A099-7690-4ECF-8994-E458F4EA1ED4}"
 	ProjectSection(ProjectDependencies) = postProject
-		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
-		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
-		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
-		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
+		{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
+		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
 	EndProjectSection
 EndProject
 Global
@@ -809,22 +782,6 @@
 		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Debug|Win32.Build.0 = Debug|Win32
 		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Release|Win32.ActiveCfg = Release|Win32
 		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Release|Win32.Build.0 = Release|Win32
-		{C4854C1D-5478-4F87-AB62-36CCDDDBA3C7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C4854C1D-5478-4F87-AB62-36CCDDDBA3C7}.Debug|Win32.Build.0 = Debug|Win32
-		{C4854C1D-5478-4F87-AB62-36CCDDDBA3C7}.Release|Win32.ActiveCfg = Release|Win32
-		{C4854C1D-5478-4F87-AB62-36CCDDDBA3C7}.Release|Win32.Build.0 = Release|Win32
-		{5786D51D-1C6A-4BE1-8804-29954DB5258F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5786D51D-1C6A-4BE1-8804-29954DB5258F}.Debug|Win32.Build.0 = Debug|Win32
-		{5786D51D-1C6A-4BE1-8804-29954DB5258F}.Release|Win32.ActiveCfg = Release|Win32
-		{5786D51D-1C6A-4BE1-8804-29954DB5258F}.Release|Win32.Build.0 = Release|Win32
-		{E969F3E0-1043-482A-AD49-787B8356BA92}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E969F3E0-1043-482A-AD49-787B8356BA92}.Debug|Win32.Build.0 = Debug|Win32
-		{E969F3E0-1043-482A-AD49-787B8356BA92}.Release|Win32.ActiveCfg = Release|Win32
-		{E969F3E0-1043-482A-AD49-787B8356BA92}.Release|Win32.Build.0 = Release|Win32
-		{91695C7C-7AD1-4782-9727-508F82D9C577}.Debug|Win32.ActiveCfg = Debug|Win32
-		{91695C7C-7AD1-4782-9727-508F82D9C577}.Debug|Win32.Build.0 = Debug|Win32
-		{91695C7C-7AD1-4782-9727-508F82D9C577}.Release|Win32.ActiveCfg = Release|Win32
-		{91695C7C-7AD1-4782-9727-508F82D9C577}.Release|Win32.Build.0 = Release|Win32
 		{6B9217D6-8259-4817-B8A5-2FEAD349EDEB}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6B9217D6-8259-4817-B8A5-2FEAD349EDEB}.Debug|Win32.Build.0 = Debug|Win32
 		{6B9217D6-8259-4817-B8A5-2FEAD349EDEB}.Release|Win32.ActiveCfg = Release|Win32
@@ -1070,10 +1027,6 @@
 		{1C453396-D912-4213-89FD-9B489162B7B5} = {A7AB4405-FDB7-4853-9FBB-1516B1C3D80A}
 		{CBEC7225-0C21-4DA8-978E-1F158F8AD950} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5}
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5}
-		{C4854C1D-5478-4F87-AB62-36CCDDDBA3C7} = {C120A020-773F-4EA3-923F-B67AF28B750D}
-		{5786D51D-1C6A-4BE1-8804-29954DB5258F} = {C120A020-773F-4EA3-923F-B67AF28B750D}
-		{E969F3E0-1043-482A-AD49-787B8356BA92} = {C120A020-773F-4EA3-923F-B67AF28B750D}
-		{91695C7C-7AD1-4782-9727-508F82D9C577} = {C120A020-773F-4EA3-923F-B67AF28B750D}
 		{6B9217D6-8259-4817-B8A5-2FEAD349EDEB} = {C120A020-773F-4EA3-923F-B67AF28B750D}
 		{5C9C69D2-8B98-42DA-8D82-6E0B48446FAC} = {C120A020-773F-4EA3-923F-B67AF28B750D}
 		{F8C28DF9-D76A-449E-A621-D97D869974DA} = {C120A020-773F-4EA3-923F-B67AF28B750D}

Modified: freeswitch/trunk/libs/win32/apr-util/libaprutil.vcproj
==============================================================================
--- freeswitch/trunk/libs/win32/apr-util/libaprutil.vcproj	(original)
+++ freeswitch/trunk/libs/win32/apr-util/libaprutil.vcproj	Tue Dec 19 17:39:38 2006
@@ -25,7 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="if not exist &quot;$(ProjectDir)..\..\include\&quot; md  &quot;$(ProjectDir)..\..\include\&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apr_ldap.h&quot; type &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apr_ldap.hw&quot; &gt; &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apr_ldap.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apu.h&quot; type &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apu.hw&quot; &gt; &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apu.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apu_config.h&quot; type &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apu_config.hw&quot; &gt; &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apu_config.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apu_select_dbm.h&quot; type &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apu_select_dbm.hw&quot; &gt; &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apu_select_dbm.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apu_want.h&quot; type &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apu_want.hw&quot; &gt; &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apu_want.h&quot;&#x0D;&#x0A;xcopy &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\*.h&quot; &quot;$(ProjectDir)..\..\include\&quot; /C /D /Y&#x0D;&#x0A;"
+				CommandLine="if not exist &quot;$(ProjectDir)..\..\include\&quot; md  &quot;$(ProjectDir)..\..\include\&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\apr-util\include\apr_ldap.h&quot; type &quot;$(ProjectDir)..\..\apr-util\include\apr_ldap.hw&quot; &gt; &quot;$(ProjectDir)..\..\apr-util\include\apr_ldap.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\apr-util\include\apu.h&quot; type &quot;$(ProjectDir)..\..\apr-util\include\apu.hw&quot; &gt; &quot;$(ProjectDir)..\..\apr-util\include\apu.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\apr-util\include\apu_config.h&quot; type &quot;$(ProjectDir)..\..\apr-util\include\apu_config.hw&quot; &gt; &quot;$(ProjectDir)..\..\apr-util\include\apu_config.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\apr-util\include\apu_select_dbm.h&quot; type &quot;$(ProjectDir)..\..\apr-util\include\apu_select_dbm.hw&quot; &gt; &quot;$(ProjectDir)..\..\apr-util\include\apu_select_dbm.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\apr-util\include\apu_want.h&quot; type &quot;$(ProjectDir)..\..\apr-util\include\apu_want.hw&quot; &gt; &quot;$(ProjectDir)..\..\apr-util\include\apu_want.h&quot;&#x0D;&#x0A;xcopy &quot;$(ProjectDir)..\..\apr-util\include\*.h&quot; &quot;$(ProjectDir)..\..\include\&quot; /C /D /Y&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -49,7 +49,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/EHsc "
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\apr-util-1.2.7\include,..\..\apr-util-1.2.7\include/private,..\..\apr-util-1.2.7\dbm/sdbm,..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include"
+				AdditionalIncludeDirectories="..\..\apr-util\include,..\..\apr-util\include/private,..\..\apr-util\dbm/sdbm,..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include"
 				PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"
 				RuntimeLibrary="3"
 				PrecompiledHeaderFile=".\Debug/libaprutil.pch"
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG,APU_VERSION_ONLY"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\apr-util-1.2.7\include,..\..\apr-util-1.2.7\include/private,..\..\apr-util-1.2.7\dbm/sdbm,..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include"
+				AdditionalIncludeDirectories="..\..\apr-util\include,..\..\apr-util\include/private,..\..\apr-util\dbm/sdbm,..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -125,7 +125,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="if not exist &quot;$(ProjectDir)..\..\include\&quot; md  &quot;$(ProjectDir)..\..\include\&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apr_ldap.h&quot; type &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apr_ldap.hw&quot; &gt; &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apr_ldap.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apu.h&quot; type &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apu.hw&quot; &gt; &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apu.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apu_config.h&quot; type &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apu_config.hw&quot; &gt; &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apu_config.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apu_select_dbm.h&quot; type &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apu_select_dbm.hw&quot; &gt; &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apu_select_dbm.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apu_want.h&quot; type &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apu_want.hw&quot; &gt; &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\apu_want.h&quot;&#x0D;&#x0A;xcopy &quot;$(ProjectDir)..\..\apr-util-1.2.7\include\*.h&quot; &quot;$(ProjectDir)..\..\include\&quot; /C /D /Y&#x0D;&#x0A;"
+				CommandLine="if not exist &quot;$(ProjectDir)..\..\include\&quot; md  &quot;$(ProjectDir)..\..\include\&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\apr-util\include\apr_ldap.h&quot; type &quot;$(ProjectDir)..\..\apr-util\include\apr_ldap.hw&quot; &gt; &quot;$(ProjectDir)..\..\apr-util\include\apr_ldap.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\apr-util\include\apu.h&quot; type &quot;$(ProjectDir)..\..\apr-util\include\apu.hw&quot; &gt; &quot;$(ProjectDir)..\..\apr-util\include\apu.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\apr-util\include\apu_config.h&quot; type &quot;$(ProjectDir)..\..\apr-util\include\apu_config.hw&quot; &gt; &quot;$(ProjectDir)..\..\apr-util\include\apu_config.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\apr-util\include\apu_select_dbm.h&quot; type &quot;$(ProjectDir)..\..\apr-util\include\apu_select_dbm.hw&quot; &gt; &quot;$(ProjectDir)..\..\apr-util\include\apu_select_dbm.h&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\apr-util\include\apu_want.h&quot; type &quot;$(ProjectDir)..\..\apr-util\include\apu_want.hw&quot; &gt; &quot;$(ProjectDir)..\..\apr-util\include\apu_want.h&quot;&#x0D;&#x0A;xcopy &quot;$(ProjectDir)..\..\apr-util\include\*.h&quot; &quot;$(ProjectDir)..\..\include\&quot; /C /D /Y&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -149,7 +149,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\apr-util-1.2.7\include,..\..\apr-util-1.2.7\include/private,..\..\apr-util-1.2.7\dbm/sdbm,..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include"
+				AdditionalIncludeDirectories="..\..\apr-util\include,..\..\apr-util\include/private,..\..\apr-util\dbm/sdbm,..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include"
 				PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -169,7 +169,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG,APU_VERSION_ONLY"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\apr-util-1.2.7\include,..\..\apr-util-1.2.7\include/private,..\..\apr-util-1.2.7\dbm/sdbm,..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include"
+				AdditionalIncludeDirectories="..\..\apr-util\include,..\..\apr-util\include/private,..\..\apr-util\dbm/sdbm,..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -228,7 +228,7 @@
 				Name="buckets"
 				>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\buckets\apr_brigade.c"
+					RelativePath="..\..\apr-util\buckets\apr_brigade.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -250,7 +250,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\buckets\apr_buckets.c"
+					RelativePath="..\..\apr-util\buckets\apr_buckets.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -272,7 +272,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\buckets\apr_buckets_alloc.c"
+					RelativePath="..\..\apr-util\buckets\apr_buckets_alloc.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -294,7 +294,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\buckets\apr_buckets_eos.c"
+					RelativePath="..\..\apr-util\buckets\apr_buckets_eos.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -316,7 +316,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\buckets\apr_buckets_file.c"
+					RelativePath="..\..\apr-util\buckets\apr_buckets_file.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -338,7 +338,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\buckets\apr_buckets_flush.c"
+					RelativePath="..\..\apr-util\buckets\apr_buckets_flush.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -360,7 +360,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\buckets\apr_buckets_heap.c"
+					RelativePath="..\..\apr-util\buckets\apr_buckets_heap.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -382,7 +382,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\buckets\apr_buckets_mmap.c"
+					RelativePath="..\..\apr-util\buckets\apr_buckets_mmap.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -404,7 +404,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\buckets\apr_buckets_pipe.c"
+					RelativePath="..\..\apr-util\buckets\apr_buckets_pipe.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -426,7 +426,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\buckets\apr_buckets_pool.c"
+					RelativePath="..\..\apr-util\buckets\apr_buckets_pool.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -448,7 +448,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\buckets\apr_buckets_refcount.c"
+					RelativePath="..\..\apr-util\buckets\apr_buckets_refcount.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -470,7 +470,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\buckets\apr_buckets_simple.c"
+					RelativePath="..\..\apr-util\buckets\apr_buckets_simple.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -492,7 +492,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\buckets\apr_buckets_socket.c"
+					RelativePath="..\..\apr-util\buckets\apr_buckets_socket.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -518,7 +518,7 @@
 				Name="crypto"
 				>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\crypto\apr_md4.c"
+					RelativePath="..\..\apr-util\crypto\apr_md4.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -540,7 +540,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\crypto\apr_md5.c"
+					RelativePath="..\..\apr-util\crypto\apr_md5.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -562,7 +562,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\crypto\apr_sha1.c"
+					RelativePath="..\..\apr-util\crypto\apr_sha1.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -584,7 +584,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\crypto\getuuid.c"
+					RelativePath="..\..\apr-util\crypto\getuuid.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -606,7 +606,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\crypto\uuid.c"
+					RelativePath="..\..\apr-util\crypto\uuid.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -632,7 +632,7 @@
 				Name="dbd"
 				>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\dbd\apr_dbd.c"
+					RelativePath="..\..\apr-util\dbd\apr_dbd.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -654,7 +654,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\dbd\apr_dbd_pgsql.c"
+					RelativePath="..\..\apr-util\dbd\apr_dbd_pgsql.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -676,7 +676,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\dbd\apr_dbd_sqlite2.c"
+					RelativePath="..\..\apr-util\dbd\apr_dbd_sqlite2.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -698,7 +698,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\dbd\apr_dbd_sqlite3.c"
+					RelativePath="..\..\apr-util\dbd\apr_dbd_sqlite3.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -724,7 +724,7 @@
 				Name="dbm"
 				>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\dbm\apr_dbm.c"
+					RelativePath="..\..\apr-util\dbm\apr_dbm.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -746,7 +746,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\dbm\apr_dbm_berkeleydb.c"
+					RelativePath="..\..\apr-util\dbm\apr_dbm_berkeleydb.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -768,7 +768,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\dbm\apr_dbm_gdbm.c"
+					RelativePath="..\..\apr-util\dbm\apr_dbm_gdbm.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -790,7 +790,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\dbm\apr_dbm_sdbm.c"
+					RelativePath="..\..\apr-util\dbm\apr_dbm_sdbm.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -816,7 +816,7 @@
 				Name="encoding"
 				>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\encoding\apr_base64.c"
+					RelativePath="..\..\apr-util\encoding\apr_base64.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -842,7 +842,7 @@
 				Name="hooks"
 				>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\hooks\apr_hooks.c"
+					RelativePath="..\..\apr-util\hooks\apr_hooks.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -868,7 +868,7 @@
 				Name="ldap"
 				>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\ldap\apr_ldap_init.c"
+					RelativePath="..\..\apr-util\ldap\apr_ldap_init.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -890,7 +890,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\ldap\apr_ldap_option.c"
+					RelativePath="..\..\apr-util\ldap\apr_ldap_option.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -912,7 +912,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\ldap\apr_ldap_url.c"
+					RelativePath="..\..\apr-util\ldap\apr_ldap_url.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -938,7 +938,7 @@
 				Name="misc"
 				>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\misc\apr_date.c"
+					RelativePath="..\..\apr-util\misc\apr_date.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -960,7 +960,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\misc\apr_queue.c"
+					RelativePath="..\..\apr-util\misc\apr_queue.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -982,7 +982,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\misc\apr_reslist.c"
+					RelativePath="..\..\apr-util\misc\apr_reslist.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -1004,7 +1004,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\misc\apr_rmm.c"
+					RelativePath="..\..\apr-util\misc\apr_rmm.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -1030,7 +1030,7 @@
 				Name="sdbm"
 				>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\dbm\sdbm\sdbm.c"
+					RelativePath="..\..\apr-util\dbm\sdbm\sdbm.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -1052,7 +1052,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\dbm\sdbm\sdbm_hash.c"
+					RelativePath="..\..\apr-util\dbm\sdbm\sdbm_hash.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -1074,7 +1074,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\dbm\sdbm\sdbm_lock.c"
+					RelativePath="..\..\apr-util\dbm\sdbm\sdbm_lock.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -1096,7 +1096,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\dbm\sdbm\sdbm_pair.c"
+					RelativePath="..\..\apr-util\dbm\sdbm\sdbm_pair.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -1118,15 +1118,15 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\dbm\sdbm\sdbm_pair.h"
+					RelativePath="..\..\apr-util\dbm\sdbm\sdbm_pair.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\dbm\sdbm\sdbm_private.h"
+					RelativePath="..\..\apr-util\dbm\sdbm\sdbm_private.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\dbm\sdbm\sdbm_tune.h"
+					RelativePath="..\..\apr-util\dbm\sdbm\sdbm_tune.h"
 					>
 				</File>
 			</Filter>
@@ -1134,7 +1134,7 @@
 				Name="strmatch"
 				>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\strmatch\apr_strmatch.c"
+					RelativePath="..\..\apr-util\strmatch\apr_strmatch.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -1160,7 +1160,7 @@
 				Name="uri"
 				>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\uri\apr_uri.c"
+					RelativePath="..\..\apr-util\uri\apr_uri.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -1186,7 +1186,7 @@
 				Name="xlate"
 				>
 				<File
-					RelativePath="..\..\apr-util-1.2.7\xlate\xlate.c"
+					RelativePath="..\..\apr-util\xlate\xlate.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -1213,15 +1213,15 @@
 			Name="Generated Files"
 			>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apr_ldap.h.in"
+				RelativePath="..\..\apr-util\include\apr_ldap.h.in"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apr_ldap.hnw"
+				RelativePath="..\..\apr-util\include\apr_ldap.hnw"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apr_ldap.hw"
+				RelativePath="..\..\apr-util\include\apr_ldap.hw"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1229,8 +1229,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Creating apr_ldap.h from apr_ldap.hw"
-						CommandLine="if not exist ..\..\apr-util-1.2.7\include\apr_ldap.h type ..\..\apr-util-1.2.7\include\apr_ldap.hw &gt; ..\..\apr-util-1.2.7\include\apr_ldap.h&#x0D;&#x0A;"
-						Outputs="..\..\apr-util-1.2.7\include\apr_ldap.h"
+						CommandLine="if not exist ..\..\apr-util\include\apr_ldap.h type ..\..\apr-util\include\apr_ldap.hw &gt; ..\..\apr-util\include\apr_ldap.h&#x0D;&#x0A;"
+						Outputs="..\..\apr-util\include\apr_ldap.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1239,21 +1239,21 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Creating apr_ldap.h from apr_ldap.hw"
-						CommandLine="if not exist ..\..\apr-util-1.2.7\include\apr_ldap.h type ..\..\apr-util-1.2.7\include\apr_ldap.hw &gt; ..\..\apr-util-1.2.7\include\apr_ldap.h&#x0D;&#x0A;"
-						Outputs="..\..\apr-util-1.2.7\include\apr_ldap.h"
+						CommandLine="if not exist ..\..\apr-util\include\apr_ldap.h type ..\..\apr-util\include\apr_ldap.hw &gt; ..\..\apr-util\include\apr_ldap.h&#x0D;&#x0A;"
+						Outputs="..\..\apr-util\include\apr_ldap.h"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apu.h.in"
+				RelativePath="..\..\apr-util\include\apu.h.in"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apu.hnw"
+				RelativePath="..\..\apr-util\include\apu.hnw"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apu.hw"
+				RelativePath="..\..\apr-util\include\apu.hw"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1261,8 +1261,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Creating apu.h from apu.hw"
-						CommandLine="if not exist ..\..\apr-util-1.2.7\include\apu.h type ..\..\apr-util-1.2.7\include\apu.hw &gt; ..\..\apr-util-1.2.7\include\apu.h&#x0D;&#x0A;"
-						Outputs="..\..\apr-util-1.2.7\include\apu.h"
+						CommandLine="if not exist ..\..\apr-util\include\apu.h type ..\..\apr-util\include\apu.hw &gt; ..\..\apr-util\include\apu.h&#x0D;&#x0A;"
+						Outputs="..\..\apr-util\include\apu.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1271,17 +1271,17 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Creating apu.h from apu.hw"
-						CommandLine="if not exist ..\..\apr-util-1.2.7\include\apu.h type ..\..\apr-util-1.2.7\include\apu.hw &gt; ..\..\apr-util-1.2.7\include\apu.h&#x0D;&#x0A;"
-						Outputs="..\..\apr-util-1.2.7\include\apu.h"
+						CommandLine="if not exist ..\..\apr-util\include\apu.h type ..\..\apr-util\include\apu.hw &gt; ..\..\apr-util\include\apu.h&#x0D;&#x0A;"
+						Outputs="..\..\apr-util\include\apu.h"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\private\apu_config.h.in"
+				RelativePath="..\..\apr-util\include\private\apu_config.h.in"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\private\apu_config.hw"
+				RelativePath="..\..\apr-util\include\private\apu_config.hw"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1289,8 +1289,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Creating apu_config.h from apu_config.hw"
-						CommandLine="if not exist ..\..\apr-util-1.2.7\include\private\apu_config.h type ..\..\apr-util-1.2.7\include\private\apu_config.hw &gt; ..\..\apr-util-1.2.7\include\private\apu_config.h&#x0D;&#x0A;"
-						Outputs="..\..\apr-util-1.2.7\include\private\apu_config.h"
+						CommandLine="if not exist ..\..\apr-util\include\private\apu_config.h type ..\..\apr-util\include\private\apu_config.hw &gt; ..\..\apr-util\include\private\apu_config.h&#x0D;&#x0A;"
+						Outputs="..\..\apr-util\include\private\apu_config.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1299,17 +1299,17 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Creating apu_config.h from apu_config.hw"
-						CommandLine="if not exist ..\..\apr-util-1.2.7\include\private\apu_config.h type ..\..\apr-util-1.2.7\include\private\apu_config.hw &gt; ..\..\apr-util-1.2.7\include\private\apu_config.h&#x0D;&#x0A;"
-						Outputs="..\..\apr-util-1.2.7\include\private\apu_config.h"
+						CommandLine="if not exist ..\..\apr-util\include\private\apu_config.h type ..\..\apr-util\include\private\apu_config.hw &gt; ..\..\apr-util\include\private\apu_config.h&#x0D;&#x0A;"
+						Outputs="..\..\apr-util\include\private\apu_config.h"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\private\apu_select_dbm.h.in"
+				RelativePath="..\..\apr-util\include\private\apu_select_dbm.h.in"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\private\apu_select_dbm.hw"
+				RelativePath="..\..\apr-util\include\private\apu_select_dbm.hw"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1317,8 +1317,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Creating apu_select_dbm.h from apu_select_dbm.hw"
-						CommandLine="if not exist ..\..\apr-util-1.2.7\include\private\apu_select_dbm.h type ..\..\apr-util-1.2.7\include\private\apu_select_dbm.hw &gt; ..\..\apr-util-1.2.7\include\private\apu_select_dbm.h&#x0D;&#x0A;"
-						Outputs="..\..\apr-util-1.2.7\include\private\apu_select_dbm.h"
+						CommandLine="if not exist ..\..\apr-util\include\private\apu_select_dbm.h type ..\..\apr-util\include\private\apu_select_dbm.hw &gt; ..\..\apr-util\include\private\apu_select_dbm.h&#x0D;&#x0A;"
+						Outputs="..\..\apr-util\include\private\apu_select_dbm.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1327,21 +1327,21 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Creating apu_select_dbm.h from apu_select_dbm.hw"
-						CommandLine="if not exist ..\..\apr-util-1.2.7\include\private\apu_select_dbm.h type ..\..\apr-util-1.2.7\include\private\apu_select_dbm.hw &gt; ..\..\apr-util-1.2.7\include\private\apu_select_dbm.h&#x0D;&#x0A;"
-						Outputs="..\..\apr-util-1.2.7\include\private\apu_select_dbm.h"
+						CommandLine="if not exist ..\..\apr-util\include\private\apu_select_dbm.h type ..\..\apr-util\include\private\apu_select_dbm.hw &gt; ..\..\apr-util\include\private\apu_select_dbm.h&#x0D;&#x0A;"
+						Outputs="..\..\apr-util\include\private\apu_select_dbm.h"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apu_want.h.in"
+				RelativePath="..\..\apr-util\include\apu_want.h.in"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apu_want.hnw"
+				RelativePath="..\..\apr-util\include\apu_want.hnw"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apu_want.hw"
+				RelativePath="..\..\apr-util\include\apu_want.hw"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1349,8 +1349,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Creating apu_want.h from apu_want.hw"
-						CommandLine="if not exist ..\..\apr-util-1.2.7\include\apu_want.h type ..\..\apr-util-1.2.7\include\apu_want.hw &gt; ..\..\apr-util-1.2.7\include\apu_want.h&#x0D;&#x0A;"
-						Outputs="..\..\apr-util-1.2.7\include\apu_want.h"
+						CommandLine="if not exist ..\..\apr-util\include\apu_want.h type ..\..\apr-util\include\apu_want.hw &gt; ..\..\apr-util\include\apu_want.h&#x0D;&#x0A;"
+						Outputs="..\..\apr-util\include\apu_want.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1359,8 +1359,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Creating apu_want.h from apu_want.hw"
-						CommandLine="if not exist ..\..\apr-util-1.2.7\include\apu_want.h type ..\..\apr-util-1.2.7\include\apu_want.hw &gt; ..\..\apr-util-1.2.7\include\apu_want.h&#x0D;&#x0A;"
-						Outputs="..\..\apr-util-1.2.7\include\apu_want.h"
+						CommandLine="if not exist ..\..\apr-util\include\apu_want.h type ..\..\apr-util\include\apu_want.hw &gt; ..\..\apr-util\include\apu_want.h&#x0D;&#x0A;"
+						Outputs="..\..\apr-util\include\apu_want.h"
 					/>
 				</FileConfiguration>
 			</File>
@@ -1369,96 +1369,96 @@
 			Name="Public Header Files"
 			>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apr_anylock.h"
+				RelativePath="..\..\apr-util\include\apr_anylock.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apr_base64.h"
+				RelativePath="..\..\apr-util\include\apr_base64.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apr_buckets.h"
+				RelativePath="..\..\apr-util\include\apr_buckets.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apr_date.h"
+				RelativePath="..\..\apr-util\include\apr_date.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apr_dbm.h"
+				RelativePath="..\..\apr-util\include\apr_dbm.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apr_hooks.h"
+				RelativePath="..\..\apr-util\include\apr_hooks.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apr_ldap_url.h"
+				RelativePath="..\..\apr-util\include\apr_ldap_url.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apr_md4.h"
+				RelativePath="..\..\apr-util\include\apr_md4.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apr_md5.h"
+				RelativePath="..\..\apr-util\include\apr_md5.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apr_optional.h"
+				RelativePath="..\..\apr-util\include\apr_optional.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apr_optional_hooks.h"
+				RelativePath="..\..\apr-util\include\apr_optional_hooks.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apr_queue.h"
+				RelativePath="..\..\apr-util\include\apr_queue.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apr_reslist.h"
+				RelativePath="..\..\apr-util\include\apr_reslist.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apr_rmm.h"
+				RelativePath="..\..\apr-util\include\apr_rmm.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apr_sdbm.h"
+				RelativePath="..\..\apr-util\include\apr_sdbm.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apr_sha1.h"
+				RelativePath="..\..\apr-util\include\apr_sha1.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apr_strmatch.h"
+				RelativePath="..\..\apr-util\include\apr_strmatch.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apr_uri.h"
+				RelativePath="..\..\apr-util\include\apr_uri.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apr_uuid.h"
+				RelativePath="..\..\apr-util\include\apr_uuid.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apr_xlate.h"
+				RelativePath="..\..\apr-util\include\apr_xlate.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apr_xml.h"
+				RelativePath="..\..\apr-util\include\apr_xml.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\include\apu_version.h"
+				RelativePath="..\..\apr-util\include\apu_version.h"
 				>
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\..\apr-util-1.2.7\libaprutil.rc"
+			RelativePath="..\..\apr-util\libaprutil.rc"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"

Modified: freeswitch/trunk/libs/win32/apr-util/xml.vcproj
==============================================================================
--- freeswitch/trunk/libs/win32/apr-util/xml.vcproj	(original)
+++ freeswitch/trunk/libs/win32/apr-util/xml.vcproj	Tue Dec 19 17:39:38 2006
@@ -43,7 +43,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="$(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\"
+				AdditionalIncludeDirectories="$(ProjectDir)..\..\apr-util\xml\expat\lib\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;VERSION=\&quot;expat_1.95.2\&quot;"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -118,7 +118,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/EHsc "
 				Optimization="0"
-				AdditionalIncludeDirectories="$(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\"
+				AdditionalIncludeDirectories="$(ProjectDir)..\..\apr-util\xml\expat\lib\"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;VERSION=\&quot;expat_1.95.2\&quot;"
 				RuntimeLibrary="3"
 				PrecompiledHeaderFile=".\LibD/xml.pch"
@@ -171,7 +171,7 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\xmlparse.c"
+				RelativePath="..\..\apr-util\xml\expat\lib\xmlparse.c"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -193,7 +193,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\xmlrole.c"
+				RelativePath="..\..\apr-util\xml\expat\lib\xmlrole.c"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -215,7 +215,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\xmltok.c"
+				RelativePath="..\..\apr-util\xml\expat\lib\xmltok.c"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -237,7 +237,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\xmltok_impl.c"
+				RelativePath="..\..\apr-util\xml\expat\lib\xmltok_impl.c"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -261,7 +261,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\xmltok_ns.c"
+				RelativePath="..\..\apr-util\xml\expat\lib\xmltok_ns.c"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -290,47 +290,47 @@
 			Filter="h;hpp;hxx;hm;inl"
 			>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\ascii.h"
+				RelativePath="..\..\apr-util\xml\expat\lib\ascii.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\asciitab.h"
+				RelativePath="..\..\apr-util\xml\expat\lib\asciitab.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\config.h"
+				RelativePath="..\..\apr-util\xml\expat\lib\config.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\expat.h"
+				RelativePath="..\..\apr-util\xml\expat\lib\expat.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\iasciitab.h"
+				RelativePath="..\..\apr-util\xml\expat\lib\iasciitab.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\latin1tab.h"
+				RelativePath="..\..\apr-util\xml\expat\lib\latin1tab.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\nametab.h"
+				RelativePath="..\..\apr-util\xml\expat\lib\nametab.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\utf8tab.h"
+				RelativePath="..\..\apr-util\xml\expat\lib\utf8tab.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\xmlrole.h"
+				RelativePath="..\..\apr-util\xml\expat\lib\xmlrole.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\xmltok.h"
+				RelativePath="..\..\apr-util\xml\expat\lib\xmltok.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\xmltok_impl.h"
+				RelativePath="..\..\apr-util\xml\expat\lib\xmltok_impl.h"
 				>
 			</File>
 		</Filter>
@@ -338,7 +338,7 @@
 			Name="Generated Header Files"
 			>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\expat.h.in"
+				RelativePath="..\..\apr-util\xml\expat\lib\expat.h.in"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -346,8 +346,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Creating expat.h from expat.h.in"
-						CommandLine="if not exist $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\expat.h type $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\expat.h.in &gt; $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\expat.h&#x0D;&#x0A;"
-						Outputs="$(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\expat.h"
+						CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h.in &gt; $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h&#x0D;&#x0A;"
+						Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -356,13 +356,13 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Creating expat.h from expat.h.in"
-						CommandLine="if not exist $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\expat.h type $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\expat.h.in &gt; $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\expat.h&#x0D;&#x0A;"
-						Outputs="$(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\expat.h"
+						CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h.in &gt; $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h&#x0D;&#x0A;"
+						Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\winconfig.h"
+				RelativePath="..\..\apr-util\xml\expat\lib\winconfig.h"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -370,8 +370,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Creating config.h from winconfig.h"
-						CommandLine="if not exist $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\config.h type $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\winconfig.h &gt; $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\config.h&#x0D;&#x0A;"
-						Outputs="$(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\config.h"
+						CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\winconfig.h &gt; $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h&#x0D;&#x0A;"
+						Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -380,14 +380,14 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Creating config.h from winconfig.h"
-						CommandLine="if not exist $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\config.h type $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\winconfig.h &gt; $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\config.h&#x0D;&#x0A;"
-						Outputs="$(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\config.h"
+						CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\winconfig.h &gt; $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h&#x0D;&#x0A;"
+						Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h"
 					/>
 				</FileConfiguration>
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\ReadMe.txt"
+			RelativePath="..\..\apr-util\xml\expat\lib\ReadMe.txt"
 			>
 		</File>
 	</Files>

Modified: freeswitch/trunk/libs/win32/apr/libapr.vcproj
==============================================================================
--- freeswitch/trunk/libs/win32/apr/libapr.vcproj	(original)
+++ freeswitch/trunk/libs/win32/apr/libapr.vcproj	Tue Dec 19 17:39:38 2006
@@ -25,7 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="if not exist &quot;$(ProjectDir)..\..\include\&quot; md  &quot;$(ProjectDir)..\..\include\&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\apr-1.2.7\include\apr.h&quot; type &quot;$(ProjectDir)apr.hw&quot; &gt; &quot;$(ProjectDir)..\..\apr-1.2.7\include\apr.h&quot;&#x0D;&#x0A;xcopy &quot;$(ProjectDir)..\..\apr-1.2.7\include\*.h&quot; &quot;$(ProjectDir)..\..\include\&quot; /C /D /Y&#x0D;&#x0A;"
+				CommandLine="if not exist &quot;$(ProjectDir)..\..\include\&quot; md  &quot;$(ProjectDir)..\..\include\&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\apr\include\apr.h&quot; type &quot;$(ProjectDir)apr.hw&quot; &gt; &quot;$(ProjectDir)..\..\apr\include\apr.h&quot;&#x0D;&#x0A;xcopy &quot;$(ProjectDir)..\..\apr\include\*.h&quot; &quot;$(ProjectDir)..\..\include\&quot; /C /D /Y&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -49,7 +49,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/EHsc "
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\..\apr-1.2.7\include&quot;;&quot;..\..\apr-1.2.7\include/arch&quot;;&quot;..\..\apr-1.2.7\include/arch/win32&quot;;&quot;..\..\apr-1.2.7\include/arch/unix&quot;"
+				AdditionalIncludeDirectories="&quot;..\..\apr\include&quot;;&quot;..\..\apr\include/arch&quot;;&quot;..\..\apr\include/arch/win32&quot;;&quot;..\..\apr\include/arch/unix&quot;"
 				PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS"
 				RuntimeLibrary="3"
 				PrecompiledHeaderFile=".\Debug/libapr.pch"
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG,APR_VERSION_ONLY"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\apr-1.2.7\include"
+				AdditionalIncludeDirectories="..\..\apr\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -124,7 +124,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="if not exist &quot;$(ProjectDir)..\..\include\&quot; md  &quot;$(ProjectDir)..\..\include\&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\apr-1.2.7\include\apr.h&quot; type &quot;$(ProjectDir)apr.hw&quot; &gt; &quot;$(ProjectDir)..\..\apr-1.2.7\include\apr.h&quot;&#x0D;&#x0A;xcopy &quot;$(ProjectDir)..\..\apr-1.2.7\include\*.h&quot; &quot;$(ProjectDir)..\..\include\&quot; /C /D /Y&#x0D;&#x0A;"
+				CommandLine="if not exist &quot;$(ProjectDir)..\..\include\&quot; md  &quot;$(ProjectDir)..\..\include\&quot;&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\..\apr\include\apr.h&quot; type &quot;$(ProjectDir)apr.hw&quot; &gt; &quot;$(ProjectDir)..\..\apr\include\apr.h&quot;&#x0D;&#x0A;xcopy &quot;$(ProjectDir)..\..\apr\include\*.h&quot; &quot;$(ProjectDir)..\..\include\&quot; /C /D /Y&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -148,7 +148,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="&quot;..\..\apr-1.2.7\include&quot;;&quot;..\..\apr-1.2.7\include/arch&quot;;&quot;..\..\apr-1.2.7\include/arch/win32&quot;;&quot;..\..\apr-1.2.7\include/arch/unix&quot;"
+				AdditionalIncludeDirectories="&quot;..\..\apr\include&quot;;&quot;..\..\apr\include/arch&quot;;&quot;..\..\apr\include/arch/win32&quot;;&quot;..\..\apr\include/arch/unix&quot;"
 				PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -168,7 +168,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG,APR_VERSION_ONLY"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\apr-1.2.7\"
+				AdditionalIncludeDirectories="..\..\apr\"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -227,7 +227,7 @@
 				Name="atomic"
 				>
 				<File
-					RelativePath="..\..\apr-1.2.7\atomic\win32\apr_atomic.c"
+					RelativePath="..\..\apr\atomic\win32\apr_atomic.c"
 					>
 				</File>
 			</Filter>
@@ -235,7 +235,7 @@
 				Name="dso"
 				>
 				<File
-					RelativePath="..\..\apr-1.2.7\dso\win32\dso.c"
+					RelativePath="..\..\apr\dso\win32\dso.c"
 					>
 				</File>
 			</Filter>
@@ -243,67 +243,67 @@
 				Name="file_io"
 				>
 				<File
-					RelativePath="..\..\apr-1.2.7\file_io\unix\copy.c"
+					RelativePath="..\..\apr\file_io\unix\copy.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\file_io\win32\dir.c"
+					RelativePath="..\..\apr\file_io\win32\dir.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\file_io\unix\fileacc.c"
+					RelativePath="..\..\apr\file_io\unix\fileacc.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\file_io\win32\filedup.c"
+					RelativePath="..\..\apr\file_io\win32\filedup.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\file_io\win32\filepath.c"
+					RelativePath="..\..\apr\file_io\win32\filepath.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\file_io\unix\filepath_util.c"
+					RelativePath="..\..\apr\file_io\unix\filepath_util.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\file_io\win32\filestat.c"
+					RelativePath="..\..\apr\file_io\win32\filestat.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\file_io\win32\filesys.c"
+					RelativePath="..\..\apr\file_io\win32\filesys.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\file_io\win32\flock.c"
+					RelativePath="..\..\apr\file_io\win32\flock.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\file_io\unix\fullrw.c"
+					RelativePath="..\..\apr\file_io\unix\fullrw.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\file_io\unix\mktemp.c"
+					RelativePath="..\..\apr\file_io\unix\mktemp.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\file_io\win32\open.c"
+					RelativePath="..\..\apr\file_io\win32\open.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\file_io\win32\pipe.c"
+					RelativePath="..\..\apr\file_io\win32\pipe.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\file_io\win32\readwrite.c"
+					RelativePath="..\..\apr\file_io\win32\readwrite.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\file_io\win32\seek.c"
+					RelativePath="..\..\apr\file_io\win32\seek.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\file_io\unix\tempdir.c"
+					RelativePath="..\..\apr\file_io\unix\tempdir.c"
 					>
 				</File>
 			</Filter>
@@ -311,19 +311,19 @@
 				Name="locks"
 				>
 				<File
-					RelativePath="..\..\apr-1.2.7\locks\win32\proc_mutex.c"
+					RelativePath="..\..\apr\locks\win32\proc_mutex.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\locks\win32\thread_cond.c"
+					RelativePath="..\..\apr\locks\win32\thread_cond.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\locks\win32\thread_mutex.c"
+					RelativePath="..\..\apr\locks\win32\thread_mutex.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\locks\win32\thread_rwlock.c"
+					RelativePath="..\..\apr\locks\win32\thread_rwlock.c"
 					>
 				</File>
 			</Filter>
@@ -331,7 +331,7 @@
 				Name="memory"
 				>
 				<File
-					RelativePath="..\..\apr-1.2.7\memory\unix\apr_pools.c"
+					RelativePath="..\..\apr\memory\unix\apr_pools.c"
 					>
 				</File>
 			</Filter>
@@ -339,47 +339,47 @@
 				Name="misc"
 				>
 				<File
-					RelativePath="..\..\apr-1.2.7\misc\win32\charset.c"
+					RelativePath="..\..\apr\misc\win32\charset.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\misc\win32\env.c"
+					RelativePath="..\..\apr\misc\win32\env.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\misc\unix\errorcodes.c"
+					RelativePath="..\..\apr\misc\unix\errorcodes.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\misc\unix\getopt.c"
+					RelativePath="..\..\apr\misc\unix\getopt.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\misc\win32\internal.c"
+					RelativePath="..\..\apr\misc\win32\internal.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\misc\win32\misc.c"
+					RelativePath="..\..\apr\misc\win32\misc.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\misc\unix\otherchild.c"
+					RelativePath="..\..\apr\misc\unix\otherchild.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\misc\win32\rand.c"
+					RelativePath="..\..\apr\misc\win32\rand.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\misc\win32\start.c"
+					RelativePath="..\..\apr\misc\win32\start.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\misc\win32\utf8.c"
+					RelativePath="..\..\apr\misc\win32\utf8.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\misc\unix\version.c"
+					RelativePath="..\..\apr\misc\unix\version.c"
 					>
 				</File>
 			</Filter>
@@ -387,11 +387,11 @@
 				Name="mmap"
 				>
 				<File
-					RelativePath="..\..\apr-1.2.7\mmap\unix\common.c"
+					RelativePath="..\..\apr\mmap\unix\common.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\mmap\win32\mmap.c"
+					RelativePath="..\..\apr\mmap\win32\mmap.c"
 					>
 				</File>
 			</Filter>
@@ -399,35 +399,35 @@
 				Name="network_io"
 				>
 				<File
-					RelativePath="..\..\apr-1.2.7\network_io\unix\inet_ntop.c"
+					RelativePath="..\..\apr\network_io\unix\inet_ntop.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\network_io\unix\inet_pton.c"
+					RelativePath="..\..\apr\network_io\unix\inet_pton.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\network_io\unix\multicast.c"
+					RelativePath="..\..\apr\network_io\unix\multicast.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\poll\unix\select.c"
+					RelativePath="..\..\apr\poll\unix\select.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\network_io\win32\sendrecv.c"
+					RelativePath="..\..\apr\network_io\win32\sendrecv.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\network_io\unix\sockaddr.c"
+					RelativePath="..\..\apr\network_io\unix\sockaddr.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\network_io\win32\sockets.c"
+					RelativePath="..\..\apr\network_io\win32\sockets.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\network_io\win32\sockopt.c"
+					RelativePath="..\..\apr\network_io\win32\sockopt.c"
 					>
 				</File>
 			</Filter>
@@ -435,7 +435,7 @@
 				Name="passwd"
 				>
 				<File
-					RelativePath="..\..\apr-1.2.7\passwd\apr_getpass.c"
+					RelativePath="..\..\apr\passwd\apr_getpass.c"
 					>
 				</File>
 			</Filter>
@@ -443,15 +443,15 @@
 				Name="random"
 				>
 				<File
-					RelativePath="..\..\apr-1.2.7\random\unix\apr_random.c"
+					RelativePath="..\..\apr\random\unix\apr_random.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\random\unix\sha2.c"
+					RelativePath="..\..\apr\random\unix\sha2.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\random\unix\sha2_glue.c"
+					RelativePath="..\..\apr\random\unix\sha2_glue.c"
 					>
 				</File>
 			</Filter>
@@ -459,7 +459,7 @@
 				Name="shmem"
 				>
 				<File
-					RelativePath="..\..\apr-1.2.7\shmem\win32\shm.c"
+					RelativePath="..\..\apr\shmem\win32\shm.c"
 					>
 				</File>
 			</Filter>
@@ -467,27 +467,27 @@
 				Name="strings"
 				>
 				<File
-					RelativePath="..\..\apr-1.2.7\strings\apr_cpystrn.c"
+					RelativePath="..\..\apr\strings\apr_cpystrn.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\strings\apr_fnmatch.c"
+					RelativePath="..\..\apr\strings\apr_fnmatch.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\strings\apr_snprintf.c"
+					RelativePath="..\..\apr\strings\apr_snprintf.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\strings\apr_strings.c"
+					RelativePath="..\..\apr\strings\apr_strings.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\strings\apr_strnatcmp.c"
+					RelativePath="..\..\apr\strings\apr_strnatcmp.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\strings\apr_strtok.c"
+					RelativePath="..\..\apr\strings\apr_strtok.c"
 					>
 				</File>
 			</Filter>
@@ -495,11 +495,11 @@
 				Name="tables"
 				>
 				<File
-					RelativePath="..\..\apr-1.2.7\tables\apr_hash.c"
+					RelativePath="..\..\apr\tables\apr_hash.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\tables\apr_tables.c"
+					RelativePath="..\..\apr\tables\apr_tables.c"
 					>
 				</File>
 			</Filter>
@@ -507,19 +507,19 @@
 				Name="threadproc"
 				>
 				<File
-					RelativePath="..\..\apr-1.2.7\threadproc\win32\proc.c"
+					RelativePath="..\..\apr\threadproc\win32\proc.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\threadproc\win32\signals.c"
+					RelativePath="..\..\apr\threadproc\win32\signals.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\threadproc\win32\thread.c"
+					RelativePath="..\..\apr\threadproc\win32\thread.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\threadproc\win32\threadpriv.c"
+					RelativePath="..\..\apr\threadproc\win32\threadpriv.c"
 					>
 				</File>
 			</Filter>
@@ -527,15 +527,15 @@
 				Name="time"
 				>
 				<File
-					RelativePath="..\..\apr-1.2.7\time\win32\access.c"
+					RelativePath="..\..\apr\time\win32\access.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\time\win32\time.c"
+					RelativePath="..\..\apr\time\win32\time.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\time\win32\timestr.c"
+					RelativePath="..\..\apr\time\win32\timestr.c"
 					>
 				</File>
 			</Filter>
@@ -543,11 +543,11 @@
 				Name="user"
 				>
 				<File
-					RelativePath="..\..\apr-1.2.7\user\win32\groupinfo.c"
+					RelativePath="..\..\apr\user\win32\groupinfo.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\apr-1.2.7\user\win32\userinfo.c"
+					RelativePath="..\..\apr\user\win32\userinfo.c"
 					>
 				</File>
 			</Filter>
@@ -556,51 +556,51 @@
 			Name="Private Header Files"
 			>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\arch\win32\apr_arch_atime.h"
+				RelativePath="..\..\apr\include\arch\win32\apr_arch_atime.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\arch\win32\apr_arch_dso.h"
+				RelativePath="..\..\apr\include\arch\win32\apr_arch_dso.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\arch\win32\apr_arch_file_io.h"
+				RelativePath="..\..\apr\include\arch\win32\apr_arch_file_io.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\arch\win32\apr_arch_inherit.h"
+				RelativePath="..\..\apr\include\arch\win32\apr_arch_inherit.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\arch\win32\apr_arch_misc.h"
+				RelativePath="..\..\apr\include\arch\win32\apr_arch_misc.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\arch\win32\apr_arch_networkio.h"
+				RelativePath="..\..\apr\include\arch\win32\apr_arch_networkio.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\arch\win32\apr_arch_thread_mutex.h"
+				RelativePath="..\..\apr\include\arch\win32\apr_arch_thread_mutex.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\arch\win32\apr_arch_thread_rwlock.h"
+				RelativePath="..\..\apr\include\arch\win32\apr_arch_thread_rwlock.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\arch\win32\apr_arch_threadproc.h"
+				RelativePath="..\..\apr\include\arch\win32\apr_arch_threadproc.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\arch\win32\apr_arch_utf8.h"
+				RelativePath="..\..\apr\include\arch\win32\apr_arch_utf8.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\arch\win32\apr_private.h"
+				RelativePath="..\..\apr\include\arch\win32\apr_private.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\arch\apr_private_common.h"
+				RelativePath="..\..\apr\include\arch\apr_private_common.h"
 				>
 			</File>
 		</Filter>
@@ -608,151 +608,151 @@
 			Name="Public Header Files"
 			>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_allocator.h"
+				RelativePath="..\..\apr\include\apr_allocator.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_atomic.h"
+				RelativePath="..\..\apr\include\apr_atomic.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_dso.h"
+				RelativePath="..\..\apr\include\apr_dso.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_env.h"
+				RelativePath="..\..\apr\include\apr_env.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_errno.h"
+				RelativePath="..\..\apr\include\apr_errno.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_file_info.h"
+				RelativePath="..\..\apr\include\apr_file_info.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_file_io.h"
+				RelativePath="..\..\apr\include\apr_file_io.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_fnmatch.h"
+				RelativePath="..\..\apr\include\apr_fnmatch.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_general.h"
+				RelativePath="..\..\apr\include\apr_general.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_getopt.h"
+				RelativePath="..\..\apr\include\apr_getopt.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_global_mutex.h"
+				RelativePath="..\..\apr\include\apr_global_mutex.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_hash.h"
+				RelativePath="..\..\apr\include\apr_hash.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_inherit.h"
+				RelativePath="..\..\apr\include\apr_inherit.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_lib.h"
+				RelativePath="..\..\apr\include\apr_lib.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_mmap.h"
+				RelativePath="..\..\apr\include\apr_mmap.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_network_io.h"
+				RelativePath="..\..\apr\include\apr_network_io.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_poll.h"
+				RelativePath="..\..\apr\include\apr_poll.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_pools.h"
+				RelativePath="..\..\apr\include\apr_pools.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_portable.h"
+				RelativePath="..\..\apr\include\apr_portable.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_proc_mutex.h"
+				RelativePath="..\..\apr\include\apr_proc_mutex.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_ring.h"
+				RelativePath="..\..\apr\include\apr_ring.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_shm.h"
+				RelativePath="..\..\apr\include\apr_shm.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_signal.h"
+				RelativePath="..\..\apr\include\apr_signal.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_strings.h"
+				RelativePath="..\..\apr\include\apr_strings.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_support.h"
+				RelativePath="..\..\apr\include\apr_support.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_tables.h"
+				RelativePath="..\..\apr\include\apr_tables.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_thread_cond.h"
+				RelativePath="..\..\apr\include\apr_thread_cond.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_thread_mutex.h"
+				RelativePath="..\..\apr\include\apr_thread_mutex.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_thread_proc.h"
+				RelativePath="..\..\apr\include\apr_thread_proc.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_thread_rwlock.h"
+				RelativePath="..\..\apr\include\apr_thread_rwlock.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_time.h"
+				RelativePath="..\..\apr\include\apr_time.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_user.h"
+				RelativePath="..\..\apr\include\apr_user.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_version.h"
+				RelativePath="..\..\apr\include\apr_version.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\apr-1.2.7\include\apr_want.h"
+				RelativePath="..\..\apr\include\apr_want.h"
 				>
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\..\apr-1.2.7\libapr.rc"
+			RelativePath="..\..\apr\libapr.rc"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
 				>
 				<Tool
 					Name="VCResourceCompilerTool"
-					AdditionalIncludeDirectories="..\..\apr-1.2.7\include"
+					AdditionalIncludeDirectories="..\..\apr\include"
 				/>
 			</FileConfiguration>
 		</File>

Modified: freeswitch/trunk/libs/win32/pcre/libpcre.vcproj
==============================================================================
--- freeswitch/trunk/libs/win32/pcre/libpcre.vcproj	(original)
+++ freeswitch/trunk/libs/win32/pcre/libpcre.vcproj	Tue Dec 19 17:39:38 2006
@@ -97,7 +97,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="if not exist &quot;$(ProjectDir)..\..\include\&quot; md  &quot;$(ProjectDir)..\..\include\&quot;&#x0D;&#x0A;xcopy &quot;$(ProjectDir)..\..\pcre-6.7\pcre.h&quot; &quot;$(ProjectDir)..\..\include\&quot; /C /D /Y&#x0D;&#x0A;"
+				CommandLine="if not exist &quot;$(ProjectDir)..\..\include\&quot; md  &quot;$(ProjectDir)..\..\include\&quot;&#x0D;&#x0A;xcopy &quot;$(ProjectDir)..\..\pcre\pcre.h&quot; &quot;$(ProjectDir)..\..\include\&quot; /C /D /Y&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -183,7 +183,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="if not exist &quot;$(ProjectDir)..\..\include\&quot; md  &quot;$(ProjectDir)..\..\include\&quot;&#x0D;&#x0A;xcopy &quot;$(ProjectDir)..\..\pcre-6.7\pcre.h&quot; &quot;$(ProjectDir)..\..\include\&quot; /C /D /Y&#x0D;&#x0A;"
+				CommandLine="if not exist &quot;$(ProjectDir)..\..\include\&quot; md  &quot;$(ProjectDir)..\..\include\&quot;&#x0D;&#x0A;xcopy &quot;$(ProjectDir)..\..\pcre\pcre.h&quot; &quot;$(ProjectDir)..\..\include\&quot; /C /D /Y&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -254,7 +254,7 @@
 				OutputFile="$(OutDir)\$(ProjectName).dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				ModuleDefinitionFile="$(InputDir)..\..\pcre-6.7\pcre.def"
+				ModuleDefinitionFile="$(InputDir)..\..\pcre\pcre.def"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(IntDir)\$(ProjectName).pdb"
 				ImportLibrary="$(IntDir)\$(ProjectName).lib"
@@ -285,7 +285,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="if not exist &quot;$(ProjectDir)..\..\include\&quot; md  &quot;$(ProjectDir)..\..\include\&quot;&#x0D;&#x0A;xcopy &quot;$(ProjectDir)..\..\pcre-6.7\pcre.h&quot; &quot;$(ProjectDir)..\..\include\&quot; /C /D /Y&#x0D;&#x0A;"
+				CommandLine="if not exist &quot;$(ProjectDir)..\..\include\&quot; md  &quot;$(ProjectDir)..\..\include\&quot;&#x0D;&#x0A;xcopy &quot;$(ProjectDir)..\..\pcre\pcre.h&quot; &quot;$(ProjectDir)..\..\include\&quot; /C /D /Y&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -356,7 +356,7 @@
 				OutputFile="$(OutDir)\$(ProjectName).dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				ModuleDefinitionFile="$(InputDir)..\..\pcre-6.7\pcre.def"
+				ModuleDefinitionFile="$(InputDir)..\..\pcre\pcre.def"
 				ProgramDatabaseFile="$(IntDir)\$(ProjectName).pdb"
 				ImportLibrary="$(IntDir)\$(ProjectName).lib"
 				TargetMachine="1"
@@ -386,7 +386,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="if not exist &quot;$(ProjectDir)..\..\include\&quot; md  &quot;$(ProjectDir)..\..\include\&quot;&#x0D;&#x0A;xcopy &quot;$(ProjectDir)..\..\pcre-6.7\pcre.h&quot; &quot;$(ProjectDir)..\..\include\&quot; /C /D /Y&#x0D;&#x0A;"
+				CommandLine="if not exist &quot;$(ProjectDir)..\..\include\&quot; md  &quot;$(ProjectDir)..\..\include\&quot;&#x0D;&#x0A;xcopy &quot;$(ProjectDir)..\..\pcre\pcre.h&quot; &quot;$(ProjectDir)..\..\include\&quot; /C /D /Y&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
@@ -402,11 +402,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\pcre-6.7\pcre_compile.c"
+				RelativePath="..\..\pcre\pcre_compile.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\pcre-6.7\pcre_config.c"
+				RelativePath="..\..\pcre\pcre_config.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -446,7 +446,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\pcre-6.7\pcre_dfa_exec.c"
+				RelativePath="..\..\pcre\pcre_dfa_exec.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -486,7 +486,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\pcre-6.7\pcre_exec.c"
+				RelativePath="..\..\pcre\pcre_exec.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -526,7 +526,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\pcre-6.7\pcre_fullinfo.c"
+				RelativePath="..\..\pcre\pcre_fullinfo.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -566,7 +566,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\pcre-6.7\pcre_get.c"
+				RelativePath="..\..\pcre\pcre_get.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -606,7 +606,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\pcre-6.7\pcre_globals.c"
+				RelativePath="..\..\pcre\pcre_globals.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -646,7 +646,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\pcre-6.7\pcre_info.c"
+				RelativePath="..\..\pcre\pcre_info.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -686,7 +686,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\pcre-6.7\pcre_maketables.c"
+				RelativePath="..\..\pcre\pcre_maketables.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -726,7 +726,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\pcre-6.7\pcre_ord2utf8.c"
+				RelativePath="..\..\pcre\pcre_ord2utf8.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -766,7 +766,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\pcre-6.7\pcre_refcount.c"
+				RelativePath="..\..\pcre\pcre_refcount.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -806,7 +806,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\pcre-6.7\pcre_study.c"
+				RelativePath="..\..\pcre\pcre_study.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -846,7 +846,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\pcre-6.7\pcre_tables.c"
+				RelativePath="..\..\pcre\pcre_tables.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -886,7 +886,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\pcre-6.7\pcre_try_flipped.c"
+				RelativePath="..\..\pcre\pcre_try_flipped.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -926,11 +926,11 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\pcre-6.7\pcre_ucp_searchfuncs.c"
+				RelativePath="..\..\pcre\pcre_ucp_searchfuncs.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\pcre-6.7\pcre_valid_utf8.c"
+				RelativePath="..\..\pcre\pcre_valid_utf8.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -970,7 +970,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\pcre-6.7\pcre_version.c"
+				RelativePath="..\..\pcre\pcre_version.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1010,7 +1010,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\pcre-6.7\pcre_xclass.c"
+				RelativePath="..\..\pcre\pcre_xclass.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1050,7 +1050,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\pcre-6.7\pcreposix.c"
+				RelativePath="..\..\pcre\pcreposix.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1099,7 +1099,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\pcre-6.7\internal.h"
+				RelativePath="..\..\pcre\internal.h"
 				>
 			</File>
 			<File
@@ -1107,11 +1107,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\pcre-6.7\pcre_internal.h"
+				RelativePath="..\..\pcre\pcre_internal.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\pcre-6.7\pcreposix.h"
+				RelativePath="..\..\pcre\pcreposix.h"
 				>
 			</File>
 		</Filter>

Modified: freeswitch/trunk/libs/win32/pcre/pcre_chartables.c.vcproj
==============================================================================
--- freeswitch/trunk/libs/win32/pcre/pcre_chartables.c.vcproj	(original)
+++ freeswitch/trunk/libs/win32/pcre/pcre_chartables.c.vcproj	Tue Dec 19 17:39:38 2006
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\pcre-6.7\"
+				AdditionalIncludeDirectories="..\..\pcre\"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -120,7 +120,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\pcre-6.7\"
+				AdditionalIncludeDirectories="..\..\pcre\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"



More information about the Freeswitch-svn mailing list