From 8e3019475e3e221c6c52750998f6171232e8100a Mon Sep 17 00:00:00 2001
From: Jeff Lenk <jeff@jefflenk.com>
Date: Mon, 23 Nov 2009 15:09:00 +0000
Subject: [PATCH] MODUNIMRCP-6 add initial build support to windows

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15610 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 Freeswitch.2008.sln                           | 140 ++++++++++++++++++
 .../libs/apr-toolkit/aprtoolkit.2008.vcproj   |   1 +
 libs/unimrcp/libs/mpf/mpf.2008.vcproj         |  91 ++++++++++--
 .../libs/mrcp-client/mrcpclient.2008.vcproj   |   1 +
 .../mrcp-signaling/mrcpsignaling.2008.vcproj  |   1 +
 libs/unimrcp/libs/mrcp/mrcp.2008.vcproj       |  45 +++---
 .../mrcpv2transport.2008.vcproj               |   1 +
 .../unimrcp/libs/uni-rtsp/unirtsp.2008.vcproj |   1 +
 .../mrcp-sofiasip/mrcpsofiasip.2008.vcproj    |   1 +
 .../mrcp-unirtsp/mrcpunirtsp.2008.vcproj      |   1 +
 .../mod_unimrcp/mod_unimrcp.2008.vcproj       |   4 +
 src/mod/asr_tts/mod_unimrcp/unimrcp.vsprops   |   4 +-
 12 files changed, 254 insertions(+), 37 deletions(-)

diff --git a/Freeswitch.2008.sln b/Freeswitch.2008.sln
index a1c52082b1..776a4b051a 100644
--- a/Freeswitch.2008.sln
+++ b/Freeswitch.2008.sln
@@ -1019,6 +1019,43 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_bv", "src\mod\codecs\mo
 		{CF70F278-3364-4395-A2E1-23501C9B8AD2} = {CF70F278-3364-4395-A2E1-23501C9B8AD2}
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "unimrcp", "unimrcp", "{62F27B1A-C919-4A70-8478-51F178F3B18F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aprtoolkit", "libs\unimrcp\libs\apr-toolkit\aprtoolkit.2008.vcproj", "{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpf", "libs\unimrcp\libs\mpf\mpf.2008.vcproj", "{B5A00BFA-6083-4FAE-A097-71642D6473B5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcp", "libs\unimrcp\libs\mrcp\mrcp.2008.vcproj", "{1C320193-46A6-4B34-9C56-8AB584FC1B56}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpclient", "libs\unimrcp\libs\mrcp-client\mrcpclient.2008.vcproj", "{72782932-37CC-46AE-8C7F-9A7B1A6EE108}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpsignaling", "libs\unimrcp\libs\mrcp-signaling\mrcpsignaling.2008.vcproj", "{12A49562-BAB9-43A3-A21D-15B60BBB4C31}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpv2transport", "libs\unimrcp\libs\mrcpv2-transport\mrcpv2transport.2008.vcproj", "{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unirtsp", "libs\unimrcp\libs\uni-rtsp\unirtsp.2008.vcproj", "{504B3154-7A4F-459D-9877-B951021C3F1F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpsofiasip", "libs\unimrcp\modules\mrcp-sofiasip\mrcpsofiasip.2008.vcproj", "{746F3632-5BB2-4570-9453-31D6D58A7D8E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpunirtsp", "libs\unimrcp\modules\mrcp-unirtsp\mrcpunirtsp.2008.vcproj", "{DEB01ACB-D65F-4A62-AED9-58C1054499E9}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_unimrcp", "src\mod\asr_tts\mod_unimrcp\mod_unimrcp.2008.vcproj", "{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA} = {A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108} = {72782932-37CC-46AE-8C7F-9A7B1A6EE108}
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E} = {746F3632-5BB2-4570-9453-31D6D58A7D8E}
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+		{504B3154-7A4F-459D-9877-B951021C3F1F} = {504B3154-7A4F-459D-9877-B951021C3F1F}
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {12A49562-BAB9-43A3-A21D-15B60BBB4C31}
+		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56} = {1C320193-46A6-4B34-9C56-8AB584FC1B56}
+		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}
+		{70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9} = {DEB01ACB-D65F-4A62-AED9-58C1054499E9}
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5} = {B5A00BFA-6083-4FAE-A097-71642D6473B5}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		All|Win32 = All|Win32
@@ -2481,6 +2518,98 @@ Global
 		{D5C87B19-150D-4EF3-A671-96589BD2D14A}.Release|Win32.Build.0 = Release|Win32
 		{D5C87B19-150D-4EF3-A671-96589BD2D14A}.Release|x64.ActiveCfg = Release|x64
 		{D5C87B19-150D-4EF3-A671-96589BD2D14A}.Release|x64.Build.0 = Release|x64
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.All|Win32.ActiveCfg = Release|Win32
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.All|Win32.Build.0 = Release|Win32
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.All|x64.ActiveCfg = Release|Win32
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|Win32.Build.0 = Debug|Win32
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|x64.ActiveCfg = Debug|Win32
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|Win32.ActiveCfg = Release|Win32
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|Win32.Build.0 = Release|Win32
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|x64.ActiveCfg = Release|Win32
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.All|Win32.ActiveCfg = Release|Win32
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.All|Win32.Build.0 = Release|Win32
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.All|x64.ActiveCfg = Release|Win32
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|Win32.Build.0 = Debug|Win32
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|x64.ActiveCfg = Debug|Win32
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|Win32.ActiveCfg = Release|Win32
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|Win32.Build.0 = Release|Win32
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|x64.ActiveCfg = Release|Win32
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.All|Win32.ActiveCfg = Release|Win32
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.All|Win32.Build.0 = Release|Win32
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.All|x64.ActiveCfg = Release|Win32
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|Win32.Build.0 = Debug|Win32
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|x64.ActiveCfg = Debug|Win32
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|Win32.ActiveCfg = Release|Win32
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|Win32.Build.0 = Release|Win32
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|x64.ActiveCfg = Release|Win32
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.All|Win32.ActiveCfg = Release|Win32
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.All|Win32.Build.0 = Release|Win32
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.All|x64.ActiveCfg = Release|Win32
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|Win32.ActiveCfg = Debug|Win32
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|Win32.Build.0 = Debug|Win32
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|x64.ActiveCfg = Debug|Win32
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|Win32.ActiveCfg = Release|Win32
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|Win32.Build.0 = Release|Win32
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|x64.ActiveCfg = Release|Win32
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.All|Win32.ActiveCfg = Release|Win32
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.All|Win32.Build.0 = Release|Win32
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.All|x64.ActiveCfg = Release|Win32
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|Win32.ActiveCfg = Debug|Win32
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|Win32.Build.0 = Debug|Win32
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|x64.ActiveCfg = Debug|Win32
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|Win32.ActiveCfg = Release|Win32
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|Win32.Build.0 = Release|Win32
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|x64.ActiveCfg = Release|Win32
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.All|Win32.ActiveCfg = Release|Win32
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.All|Win32.Build.0 = Release|Win32
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.All|x64.ActiveCfg = Release|Win32
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|Win32.Build.0 = Debug|Win32
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|x64.ActiveCfg = Debug|Win32
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|Win32.ActiveCfg = Release|Win32
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|Win32.Build.0 = Release|Win32
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|x64.ActiveCfg = Release|Win32
+		{504B3154-7A4F-459D-9877-B951021C3F1F}.All|Win32.ActiveCfg = Release|Win32
+		{504B3154-7A4F-459D-9877-B951021C3F1F}.All|Win32.Build.0 = Release|Win32
+		{504B3154-7A4F-459D-9877-B951021C3F1F}.All|x64.ActiveCfg = Release|Win32
+		{504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|Win32.Build.0 = Debug|Win32
+		{504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|x64.ActiveCfg = Debug|Win32
+		{504B3154-7A4F-459D-9877-B951021C3F1F}.Release|Win32.ActiveCfg = Release|Win32
+		{504B3154-7A4F-459D-9877-B951021C3F1F}.Release|Win32.Build.0 = Release|Win32
+		{504B3154-7A4F-459D-9877-B951021C3F1F}.Release|x64.ActiveCfg = Release|Win32
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.All|Win32.ActiveCfg = Release|Win32
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.All|Win32.Build.0 = Release|Win32
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.All|x64.ActiveCfg = Release|Win32
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|Win32.Build.0 = Debug|Win32
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|x64.ActiveCfg = Debug|Win32
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|Win32.ActiveCfg = Release|Win32
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|Win32.Build.0 = Release|Win32
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|x64.ActiveCfg = Release|Win32
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.All|Win32.ActiveCfg = Release|Win32
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.All|Win32.Build.0 = Release|Win32
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.All|x64.ActiveCfg = Release|Win32
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|Win32.Build.0 = Debug|Win32
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|x64.ActiveCfg = Debug|Win32
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|Win32.ActiveCfg = Release|Win32
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|Win32.Build.0 = Release|Win32
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|x64.ActiveCfg = Release|Win32
+		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.All|Win32.ActiveCfg = Release|x64
+		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.All|x64.ActiveCfg = Release|x64
+		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.All|x64.Build.0 = Release|x64
+		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|Win32.Build.0 = Debug|Win32
+		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|x64.ActiveCfg = Debug|x64
+		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|x64.Build.0 = Debug|x64
+		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|Win32.ActiveCfg = Release|Win32
+		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|Win32.Build.0 = Release|Win32
+		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|x64.ActiveCfg = Release|x64
+		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2547,6 +2676,7 @@ Global
 		{692F6330-4D87-4C82-81DF-40DB5892636E} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}
 		{2286DA73-9FC5-45BC-A508-85994C3317AB} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}
 		{66444AEE-554C-11DD-A9F0-8C5D56D89593} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}
+		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}
 		{1C453396-D912-4213-89FD-9B489162B7B5} = {A7AB4405-FDB7-4853-9FBB-1516B1C3D80A}
 		{D0BCAC02-D94B-46B8-9B49-CDDCC2BD7909} = {A7AB4405-FDB7-4853-9FBB-1516B1C3D80A}
 		{CBEC7225-0C21-4DA8-978E-1F158F8AD950} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5}
@@ -2591,6 +2721,7 @@ Global
 		{DEE932AB-5911-4700-9EEB-8C7090A0A330} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{329A6FA0-0FCC-4435-A950-E670AEFA9838} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{CF70F278-3364-4395-A2E1-23501C9B8AD2} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
+		{62F27B1A-C919-4A70-8478-51F178F3B18F} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {C120A020-773F-4EA3-923F-B67AF28B750D}
 		{4F92B672-DADB-4047-8D6A-4BB3796733FD} = {C120A020-773F-4EA3-923F-B67AF28B750D}
 		{2DEE4895-1134-439C-B688-52203E57D878} = {C120A020-773F-4EA3-923F-B67AF28B750D}
@@ -2666,5 +2797,14 @@ Global
 		{D1ABE208-6442-4FB4-9AAD-1677E41BC870} = {4F227C26-768F-46A3-8684-1D08A46FB374}
 		{BA599D0A-4310-4505-91DA-6A6447B3E289} = {4F227C26-768F-46A3-8684-1D08A46FB374}
 		{EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959} = {4F227C26-768F-46A3-8684-1D08A46FB374}
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {62F27B1A-C919-4A70-8478-51F178F3B18F}
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5} = {62F27B1A-C919-4A70-8478-51F178F3B18F}
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56} = {62F27B1A-C919-4A70-8478-51F178F3B18F}
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108} = {62F27B1A-C919-4A70-8478-51F178F3B18F}
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {62F27B1A-C919-4A70-8478-51F178F3B18F}
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA} = {62F27B1A-C919-4A70-8478-51F178F3B18F}
+		{504B3154-7A4F-459D-9877-B951021C3F1F} = {62F27B1A-C919-4A70-8478-51F178F3B18F}
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E} = {62F27B1A-C919-4A70-8478-51F178F3B18F}
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9} = {62F27B1A-C919-4A70-8478-51F178F3B18F}
 	EndGlobalSection
 EndGlobal
diff --git a/libs/unimrcp/libs/apr-toolkit/aprtoolkit.2008.vcproj b/libs/unimrcp/libs/apr-toolkit/aprtoolkit.2008.vcproj
index 68284173b3..327bdc2efa 100644
--- a/libs/unimrcp/libs/apr-toolkit/aprtoolkit.2008.vcproj
+++ b/libs/unimrcp/libs/apr-toolkit/aprtoolkit.2008.vcproj
@@ -39,6 +39,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="APT_STATIC_LIB"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/libs/unimrcp/libs/mpf/mpf.2008.vcproj b/libs/unimrcp/libs/mpf/mpf.2008.vcproj
index 556f4f7cb5..45f4be011d 100644
--- a/libs/unimrcp/libs/mpf/mpf.2008.vcproj
+++ b/libs/unimrcp/libs/mpf/mpf.2008.vcproj
@@ -40,6 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="codecs"
+				PreprocessorDefinitions="APT_STATIC_LIB;MPF_STATIC_LIB"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -192,6 +193,14 @@
 				RelativePath=".\include\mpf_decoder.h"
 				>
 			</File>
+			<File
+				RelativePath=".\include\mpf_dtmf_detector.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\mpf_dtmf_generator.h"
+				>
+			</File>
 			<File
 				RelativePath=".\include\mpf_encoder.h"
 				>
@@ -216,18 +225,34 @@
 				RelativePath=".\include\mpf_jitter_buffer.h"
 				>
 			</File>
-			<File
-				RelativePath=".\include\mpf_media_descriptor.h"
-				>
-			</File>
 			<File
 				RelativePath=".\include\mpf_message.h"
 				>
 			</File>
+			<File
+				RelativePath=".\include\mpf_mixer.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\mpf_multiplier.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\mpf_named_event.h"
+				>
+			</File>
 			<File
 				RelativePath=".\include\mpf_object.h"
 				>
 			</File>
+			<File
+				RelativePath=".\include\mpf_resampler.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\mpf_rtcp_packet.h"
+				>
+			</File>
 			<File
 				RelativePath=".\include\mpf_rtp_attribs.h"
 				>
@@ -244,6 +269,10 @@
 				RelativePath=".\include\mpf_rtp_header.h"
 				>
 			</File>
+			<File
+				RelativePath=".\include\mpf_rtp_pt.h"
+				>
+			</File>
 			<File
 				RelativePath=".\include\mpf_rtp_stat.h"
 				>
@@ -256,12 +285,16 @@
 				RelativePath=".\include\mpf_rtp_termination_factory.h"
 				>
 			</File>
+			<File
+				RelativePath=".\include\mpf_scheduler.h"
+				>
+			</File>
 			<File
 				RelativePath=".\include\mpf_stream.h"
 				>
 			</File>
 			<File
-				RelativePath=".\include\mpf_stream_mode.h"
+				RelativePath=".\include\mpf_stream_descriptor.h"
 				>
 			</File>
 			<File
@@ -269,17 +302,17 @@
 				>
 			</File>
 			<File
-				RelativePath=".\include\mpf_timer.h"
+				RelativePath=".\include\mpf_termination_factory.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\mpf_timer_manager.h"
 				>
 			</File>
 			<File
 				RelativePath=".\include\mpf_types.h"
 				>
 			</File>
-			<File
-				RelativePath=".\include\mpf_user.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="src"
@@ -325,6 +358,14 @@
 				RelativePath=".\src\mpf_decoder.c"
 				>
 			</File>
+			<File
+				RelativePath=".\src\mpf_dtmf_detector.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\mpf_dtmf_generator.c"
+				>
+			</File>
 			<File
 				RelativePath=".\src\mpf_encoder.c"
 				>
@@ -345,6 +386,22 @@
 				RelativePath=".\src\mpf_jitter_buffer.c"
 				>
 			</File>
+			<File
+				RelativePath=".\src\mpf_mixer.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\mpf_multiplier.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\mpf_named_event.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\mpf_resampler.c"
+				>
+			</File>
 			<File
 				RelativePath=".\src\mpf_rtp_attribs.c"
 				>
@@ -357,12 +414,24 @@
 				RelativePath=".\src\mpf_rtp_termination_factory.c"
 				>
 			</File>
+			<File
+				RelativePath=".\src\mpf_scheduler.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\mpf_stream.c"
+				>
+			</File>
 			<File
 				RelativePath=".\src\mpf_termination.c"
 				>
 			</File>
 			<File
-				RelativePath=".\src\mpf_timer.c"
+				RelativePath=".\src\mpf_termination_factory.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\mpf_timer_manager.c"
 				>
 			</File>
 		</Filter>
diff --git a/libs/unimrcp/libs/mrcp-client/mrcpclient.2008.vcproj b/libs/unimrcp/libs/mrcp-client/mrcpclient.2008.vcproj
index d58072c67f..c58ee05eb9 100644
--- a/libs/unimrcp/libs/mrcp-client/mrcpclient.2008.vcproj
+++ b/libs/unimrcp/libs/mrcp-client/mrcpclient.2008.vcproj
@@ -39,6 +39,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="APT_STATIC_LIB;MPF_STATIC_LIB;MRCP_STATIC_LIB"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.2008.vcproj b/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.2008.vcproj
index bd3b3b59ce..3b5b7d0bc8 100644
--- a/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.2008.vcproj
+++ b/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.2008.vcproj
@@ -39,6 +39,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="APT_STATIC_LIB;MPF_STATIC_LIB;MRCP_STATIC_LIB"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/libs/unimrcp/libs/mrcp/mrcp.2008.vcproj b/libs/unimrcp/libs/mrcp/mrcp.2008.vcproj
index 6fe61a549e..34f7056547 100644
--- a/libs/unimrcp/libs/mrcp/mrcp.2008.vcproj
+++ b/libs/unimrcp/libs/mrcp/mrcp.2008.vcproj
@@ -40,6 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="APT_STATIC_LIB;MPF_STATIC_LIB;MRCP_STATIC_LIB"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -160,6 +161,10 @@
 					RelativePath=".\message\include\mrcp_message.h"
 					>
 				</File>
+				<File
+					RelativePath=".\message\include\mrcp_start_line.h"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="src"
@@ -177,6 +182,10 @@
 					RelativePath=".\message\src\mrcp_message.c"
 					>
 				</File>
+				<File
+					RelativePath=".\message\src\mrcp_start_line.c"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
@@ -195,7 +204,7 @@
 					>
 				</File>
 				<File
-					RelativePath=".\control\include\mrcp_state_machine.h"
+					RelativePath=".\control\include\mrcp_resource_loader.h"
 					>
 				</File>
 				<File
@@ -211,6 +220,10 @@
 					RelativePath=".\control\src\mrcp_resource_factory.c"
 					>
 				</File>
+				<File
+					RelativePath=".\control\src\mrcp_resource_loader.c"
+					>
+				</File>
 				<File
 					RelativePath=".\control\src\mrcp_stream.c"
 					>
@@ -224,10 +237,6 @@
 				Name="include"
 				Filter="h;hpp;hxx;hm;inl;inc;xsd"
 				>
-				<File
-					RelativePath=".\resources\include\mrcp_default_factory.h"
-					>
-				</File>
 				<File
 					RelativePath=".\resources\include\mrcp_recog_header.h"
 					>
@@ -237,7 +246,11 @@
 					>
 				</File>
 				<File
-					RelativePath=".\resources\include\mrcp_recog_state_machine.h"
+					RelativePath=".\resources\include\mrcp_recorder_header.h"
+					>
+				</File>
+				<File
+					RelativePath=".\resources\include\mrcp_recorder_resource.h"
 					>
 				</File>
 				<File
@@ -248,23 +261,11 @@
 					RelativePath=".\resources\include\mrcp_synth_resource.h"
 					>
 				</File>
-				<File
-					RelativePath=".\resources\include\mrcp_synth_state_machine.h"
-					>
-				</File>
 			</Filter>
 			<Filter
 				Name="src"
 				Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 				>
-				<File
-					RelativePath=".\resources\src\mrcp_default_factory.c"
-					>
-				</File>
-				<File
-					RelativePath=".\resources\src\mrcp_recog_client_state_machine.c"
-					>
-				</File>
 				<File
 					RelativePath=".\resources\src\mrcp_recog_header.c"
 					>
@@ -274,11 +275,11 @@
 					>
 				</File>
 				<File
-					RelativePath=".\resources\src\mrcp_recog_server_state_machine.c"
+					RelativePath=".\resources\src\mrcp_recorder_header.c"
 					>
 				</File>
 				<File
-					RelativePath=".\resources\src\mrcp_synth_client_state_machine.c"
+					RelativePath=".\resources\src\mrcp_recorder_resource.c"
 					>
 				</File>
 				<File
@@ -289,10 +290,6 @@
 					RelativePath=".\resources\src\mrcp_synth_resource.c"
 					>
 				</File>
-				<File
-					RelativePath=".\resources\src\mrcp_synth_server_state_machine.c"
-					>
-				</File>
 			</Filter>
 		</Filter>
 	</Files>
diff --git a/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.2008.vcproj b/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.2008.vcproj
index d5d476181d..0896c21109 100644
--- a/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.2008.vcproj
+++ b/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.2008.vcproj
@@ -39,6 +39,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="APT_STATIC_LIB;MPF_STATIC_LIB;MRCP_STATIC_LIB"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/libs/unimrcp/libs/uni-rtsp/unirtsp.2008.vcproj b/libs/unimrcp/libs/uni-rtsp/unirtsp.2008.vcproj
index 22da8b23e0..46a04f6cb8 100644
--- a/libs/unimrcp/libs/uni-rtsp/unirtsp.2008.vcproj
+++ b/libs/unimrcp/libs/uni-rtsp/unirtsp.2008.vcproj
@@ -40,6 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="codecs"
+				PreprocessorDefinitions="APT_STATIC_LIB"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.2008.vcproj b/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.2008.vcproj
index 22df958efd..7b858140f7 100644
--- a/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.2008.vcproj
+++ b/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.2008.vcproj
@@ -40,6 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="include"
+				PreprocessorDefinitions="APT_STATIC_LIB;MPF_STATIC_LIB;MRCP_STATIC_LIB;LIBSOFIA_SIP_UA_STATIC"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.2008.vcproj b/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.2008.vcproj
index 065bab7436..70902908f2 100644
--- a/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.2008.vcproj
+++ b/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.2008.vcproj
@@ -40,6 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="include"
+				PreprocessorDefinitions="APT_STATIC_LIB;RTSP_STATIC_LIB;MPF_STATIC_LIB;MRCP_STATIC_LIB;LIBSOFIA_SIP_UA_STATIC"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.2008.vcproj b/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.2008.vcproj
index d00b6ffe03..d5ff2948ef 100644
--- a/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.2008.vcproj
+++ b/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.2008.vcproj
@@ -21,6 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;.\unimrcp.vsprops"
 			CharacterSet="2"
@@ -42,6 +43,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="APT_STATIC_LIB;MPF_STATIC_LIB;MRCP_STATIC_LIB;LIBSOFIA_SIP_UA_STATIC"
 				UsePrecompiledHeader="0"
 			/>
 			<Tool
@@ -55,6 +57,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalLibraryDirectories="$(SolutionDir)Debug/bin"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 			/>
@@ -82,6 +85,7 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;.\unimrcp.vsprops"
 			CharacterSet="2"
diff --git a/src/mod/asr_tts/mod_unimrcp/unimrcp.vsprops b/src/mod/asr_tts/mod_unimrcp/unimrcp.vsprops
index 44475fc622..359408084a 100644
--- a/src/mod/asr_tts/mod_unimrcp/unimrcp.vsprops
+++ b/src/mod/asr_tts/mod_unimrcp/unimrcp.vsprops
@@ -7,7 +7,7 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="&quot;$(SolutionDir)libs\unimrcp\platforms\libunimrcp-client\include&quot;;&quot;$(SolutionDir)libs\unimrcp\include&quot;;&quot;$(SolutionDir)libs\unimrcp\libs\apr-toolkit\include&quot;;&quot;$(SolutionDir)libs\unimrcp\build&quot;"
-		PreprocessorDefinitions=""
+		AdditionalIncludeDirectories="&quot;$(SolutionDir)libs\unimrcp\platforms\libunimrcp-client\include&quot;;&quot;$(SolutionDir)libs\unimrcp\libs\mrcp-client\include&quot;;&quot;$(SolutionDir)libs\unimrcp\libs\mrcp-signaling\include&quot;;&quot;$(SolutionDir)libs\unimrcp\libs\apr-toolkit\include&quot;;&quot;$(SolutionDir)libs\unimrcp\build&quot;;&quot;$(SolutionDir)libs\unimrcp\libs\mrcp\include&quot;;&quot;$(SolutionDir)libs\unimrcp\libs\mrcp\message\include&quot;;&quot;$(SolutionDir)libs\unimrcp\libs\mrcp\control\include&quot;;&quot;$(SolutionDir)libs\unimrcp\libs\mrcp\resources\include&quot;;&quot;$(SolutionDir)libs\unimrcp\libs\mpf\include&quot;;&quot;$(SolutionDir)libs\unimrcp\libs\mrcpv2-transport\include&quot;;&quot;$(SolutionDir)libs\unimrcp\modules\mrcp-sofiasip\include&quot;;&quot;$(SolutionDir)libs\unimrcp\modules\mrcp-unirtsp\include&quot;"
+		PreprocessorDefinitions="MRCP_STATIC_LIB MPF_STATIC_LIB APT_STATIC_LIB"
 	/>
 </VisualStudioPropertySheet>