MODUNIMRCP-6 add initial build support to windows

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

diff --git a/Freeswitch.2008.sln b/Freeswitch.2008.sln
index a1c52082b1a2661f5f2bb82c2d21bb7eba8e7be5..776a4b051a101277ea7b4d286318e6321d370eab 100644 (file)
--- 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}\r
        EndProjectSection\r
 EndProject\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "unimrcp", "unimrcp", "{62F27B1A-C919-4A70-8478-51F178F3B18F}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aprtoolkit", "libs\unimrcp\libs\apr-toolkit\aprtoolkit.2008.vcproj", "{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpf", "libs\unimrcp\libs\mpf\mpf.2008.vcproj", "{B5A00BFA-6083-4FAE-A097-71642D6473B5}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcp", "libs\unimrcp\libs\mrcp\mrcp.2008.vcproj", "{1C320193-46A6-4B34-9C56-8AB584FC1B56}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpclient", "libs\unimrcp\libs\mrcp-client\mrcpclient.2008.vcproj", "{72782932-37CC-46AE-8C7F-9A7B1A6EE108}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpsignaling", "libs\unimrcp\libs\mrcp-signaling\mrcpsignaling.2008.vcproj", "{12A49562-BAB9-43A3-A21D-15B60BBB4C31}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpv2transport", "libs\unimrcp\libs\mrcpv2-transport\mrcpv2transport.2008.vcproj", "{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unirtsp", "libs\unimrcp\libs\uni-rtsp\unirtsp.2008.vcproj", "{504B3154-7A4F-459D-9877-B951021C3F1F}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpsofiasip", "libs\unimrcp\modules\mrcp-sofiasip\mrcpsofiasip.2008.vcproj", "{746F3632-5BB2-4570-9453-31D6D58A7D8E}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpunirtsp", "libs\unimrcp\modules\mrcp-unirtsp\mrcpunirtsp.2008.vcproj", "{DEB01ACB-D65F-4A62-AED9-58C1054499E9}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_unimrcp", "src\mod\asr_tts\mod_unimrcp\mod_unimrcp.2008.vcproj", "{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA} = {A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}\r
+               {72782932-37CC-46AE-8C7F-9A7B1A6EE108} = {72782932-37CC-46AE-8C7F-9A7B1A6EE108}\r
+               {746F3632-5BB2-4570-9453-31D6D58A7D8E} = {746F3632-5BB2-4570-9453-31D6D58A7D8E}\r
+               {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
+               {504B3154-7A4F-459D-9877-B951021C3F1F} = {504B3154-7A4F-459D-9877-B951021C3F1F}\r
+               {12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {12A49562-BAB9-43A3-A21D-15B60BBB4C31}\r
+               {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}\r
+               {1C320193-46A6-4B34-9C56-8AB584FC1B56} = {1C320193-46A6-4B34-9C56-8AB584FC1B56}\r
+               {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}\r
+               {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}\r
+               {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}\r
+               {DEB01ACB-D65F-4A62-AED9-58C1054499E9} = {DEB01ACB-D65F-4A62-AED9-58C1054499E9}\r
+               {B5A00BFA-6083-4FAE-A097-71642D6473B5} = {B5A00BFA-6083-4FAE-A097-71642D6473B5}\r
+       EndProjectSection\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                All|Win32 = All|Win32\r
@@ -2481,6 +2518,98 @@ Global
                {D5C87B19-150D-4EF3-A671-96589BD2D14A}.Release|Win32.Build.0 = Release|Win32\r
                {D5C87B19-150D-4EF3-A671-96589BD2D14A}.Release|x64.ActiveCfg = Release|x64\r
                {D5C87B19-150D-4EF3-A671-96589BD2D14A}.Release|x64.Build.0 = Release|x64\r
+               {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.All|Win32.ActiveCfg = Release|Win32\r
+               {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.All|Win32.Build.0 = Release|Win32\r
+               {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.All|x64.ActiveCfg = Release|Win32\r
+               {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|Win32.Build.0 = Debug|Win32\r
+               {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|Win32.ActiveCfg = Release|Win32\r
+               {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|Win32.Build.0 = Release|Win32\r
+               {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|x64.ActiveCfg = Release|Win32\r
+               {B5A00BFA-6083-4FAE-A097-71642D6473B5}.All|Win32.ActiveCfg = Release|Win32\r
+               {B5A00BFA-6083-4FAE-A097-71642D6473B5}.All|Win32.Build.0 = Release|Win32\r
+               {B5A00BFA-6083-4FAE-A097-71642D6473B5}.All|x64.ActiveCfg = Release|Win32\r
+               {B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|Win32.Build.0 = Debug|Win32\r
+               {B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|Win32.ActiveCfg = Release|Win32\r
+               {B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|Win32.Build.0 = Release|Win32\r
+               {B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|x64.ActiveCfg = Release|Win32\r
+               {1C320193-46A6-4B34-9C56-8AB584FC1B56}.All|Win32.ActiveCfg = Release|Win32\r
+               {1C320193-46A6-4B34-9C56-8AB584FC1B56}.All|Win32.Build.0 = Release|Win32\r
+               {1C320193-46A6-4B34-9C56-8AB584FC1B56}.All|x64.ActiveCfg = Release|Win32\r
+               {1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|Win32.Build.0 = Debug|Win32\r
+               {1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|Win32.ActiveCfg = Release|Win32\r
+               {1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|Win32.Build.0 = Release|Win32\r
+               {1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|x64.ActiveCfg = Release|Win32\r
+               {72782932-37CC-46AE-8C7F-9A7B1A6EE108}.All|Win32.ActiveCfg = Release|Win32\r
+               {72782932-37CC-46AE-8C7F-9A7B1A6EE108}.All|Win32.Build.0 = Release|Win32\r
+               {72782932-37CC-46AE-8C7F-9A7B1A6EE108}.All|x64.ActiveCfg = Release|Win32\r
+               {72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|Win32.Build.0 = Debug|Win32\r
+               {72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|Win32.ActiveCfg = Release|Win32\r
+               {72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|Win32.Build.0 = Release|Win32\r
+               {72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|x64.ActiveCfg = Release|Win32\r
+               {12A49562-BAB9-43A3-A21D-15B60BBB4C31}.All|Win32.ActiveCfg = Release|Win32\r
+               {12A49562-BAB9-43A3-A21D-15B60BBB4C31}.All|Win32.Build.0 = Release|Win32\r
+               {12A49562-BAB9-43A3-A21D-15B60BBB4C31}.All|x64.ActiveCfg = Release|Win32\r
+               {12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|Win32.Build.0 = Debug|Win32\r
+               {12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|Win32.ActiveCfg = Release|Win32\r
+               {12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|Win32.Build.0 = Release|Win32\r
+               {12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|x64.ActiveCfg = Release|Win32\r
+               {A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.All|Win32.ActiveCfg = Release|Win32\r
+               {A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.All|Win32.Build.0 = Release|Win32\r
+               {A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.All|x64.ActiveCfg = Release|Win32\r
+               {A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|Win32.Build.0 = Debug|Win32\r
+               {A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|Win32.ActiveCfg = Release|Win32\r
+               {A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|Win32.Build.0 = Release|Win32\r
+               {A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|x64.ActiveCfg = Release|Win32\r
+               {504B3154-7A4F-459D-9877-B951021C3F1F}.All|Win32.ActiveCfg = Release|Win32\r
+               {504B3154-7A4F-459D-9877-B951021C3F1F}.All|Win32.Build.0 = Release|Win32\r
+               {504B3154-7A4F-459D-9877-B951021C3F1F}.All|x64.ActiveCfg = Release|Win32\r
+               {504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|Win32.Build.0 = Debug|Win32\r
+               {504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {504B3154-7A4F-459D-9877-B951021C3F1F}.Release|Win32.ActiveCfg = Release|Win32\r
+               {504B3154-7A4F-459D-9877-B951021C3F1F}.Release|Win32.Build.0 = Release|Win32\r
+               {504B3154-7A4F-459D-9877-B951021C3F1F}.Release|x64.ActiveCfg = Release|Win32\r
+               {746F3632-5BB2-4570-9453-31D6D58A7D8E}.All|Win32.ActiveCfg = Release|Win32\r
+               {746F3632-5BB2-4570-9453-31D6D58A7D8E}.All|Win32.Build.0 = Release|Win32\r
+               {746F3632-5BB2-4570-9453-31D6D58A7D8E}.All|x64.ActiveCfg = Release|Win32\r
+               {746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|Win32.Build.0 = Debug|Win32\r
+               {746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|Win32.ActiveCfg = Release|Win32\r
+               {746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|Win32.Build.0 = Release|Win32\r
+               {746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|x64.ActiveCfg = Release|Win32\r
+               {DEB01ACB-D65F-4A62-AED9-58C1054499E9}.All|Win32.ActiveCfg = Release|Win32\r
+               {DEB01ACB-D65F-4A62-AED9-58C1054499E9}.All|Win32.Build.0 = Release|Win32\r
+               {DEB01ACB-D65F-4A62-AED9-58C1054499E9}.All|x64.ActiveCfg = Release|Win32\r
+               {DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|Win32.Build.0 = Debug|Win32\r
+               {DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|Win32.ActiveCfg = Release|Win32\r
+               {DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|Win32.Build.0 = Release|Win32\r
+               {DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|x64.ActiveCfg = Release|Win32\r
+               {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.All|Win32.ActiveCfg = Release|x64\r
+               {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.All|x64.ActiveCfg = Release|x64\r
+               {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.All|x64.Build.0 = Release|x64\r
+               {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|Win32.Build.0 = Debug|Win32\r
+               {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|x64.ActiveCfg = Debug|x64\r
+               {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|x64.Build.0 = Debug|x64\r
+               {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|Win32.ActiveCfg = Release|Win32\r
+               {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|Win32.Build.0 = Release|Win32\r
+               {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|x64.ActiveCfg = Release|x64\r
+               {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|x64.Build.0 = Release|x64\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
@@ -2547,6 +2676,7 @@ Global
                {692F6330-4D87-4C82-81DF-40DB5892636E} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}\r
                {2286DA73-9FC5-45BC-A508-85994C3317AB} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}\r
                {66444AEE-554C-11DD-A9F0-8C5D56D89593} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}\r
+               {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}\r
                {1C453396-D912-4213-89FD-9B489162B7B5} = {A7AB4405-FDB7-4853-9FBB-1516B1C3D80A}\r
                {D0BCAC02-D94B-46B8-9B49-CDDCC2BD7909} = {A7AB4405-FDB7-4853-9FBB-1516B1C3D80A}\r
                {CBEC7225-0C21-4DA8-978E-1F158F8AD950} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5}\r
@@ -2591,6 +2721,7 @@ Global
                {DEE932AB-5911-4700-9EEB-8C7090A0A330} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {329A6FA0-0FCC-4435-A950-E670AEFA9838} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {CF70F278-3364-4395-A2E1-23501C9B8AD2} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
+               {62F27B1A-C919-4A70-8478-51F178F3B18F} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {4F92B672-DADB-4047-8D6A-4BB3796733FD} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {2DEE4895-1134-439C-B688-52203E57D878} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
@@ -2666,5 +2797,14 @@ Global
                {D1ABE208-6442-4FB4-9AAD-1677E41BC870} = {4F227C26-768F-46A3-8684-1D08A46FB374}\r
                {BA599D0A-4310-4505-91DA-6A6447B3E289} = {4F227C26-768F-46A3-8684-1D08A46FB374}\r
                {EED13FC7-4F81-4E6F-93DB-CDB7DF5CF959} = {4F227C26-768F-46A3-8684-1D08A46FB374}\r
+               {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {62F27B1A-C919-4A70-8478-51F178F3B18F}\r
+               {B5A00BFA-6083-4FAE-A097-71642D6473B5} = {62F27B1A-C919-4A70-8478-51F178F3B18F}\r
+               {1C320193-46A6-4B34-9C56-8AB584FC1B56} = {62F27B1A-C919-4A70-8478-51F178F3B18F}\r
+               {72782932-37CC-46AE-8C7F-9A7B1A6EE108} = {62F27B1A-C919-4A70-8478-51F178F3B18F}\r
+               {12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {62F27B1A-C919-4A70-8478-51F178F3B18F}\r
+               {A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA} = {62F27B1A-C919-4A70-8478-51F178F3B18F}\r
+               {504B3154-7A4F-459D-9877-B951021C3F1F} = {62F27B1A-C919-4A70-8478-51F178F3B18F}\r
+               {746F3632-5BB2-4570-9453-31D6D58A7D8E} = {62F27B1A-C919-4A70-8478-51F178F3B18F}\r
+               {DEB01ACB-D65F-4A62-AED9-58C1054499E9} = {62F27B1A-C919-4A70-8478-51F178F3B18F}\r
        EndGlobalSection\r
 EndGlobal\r

diff --git a/libs/unimrcp/libs/apr-toolkit/aprtoolkit.2008.vcproj b/libs/unimrcp/libs/apr-toolkit/aprtoolkit.2008.vcproj
index 68284173b3e790be856138a017d7cee667844e67..327bdc2efaa908a63973dc84bc681f0f9e4b76e3 100644 (file)
--- a/libs/unimrcp/libs/apr-toolkit/aprtoolkit.2008.vcproj
+++ b/libs/unimrcp/libs/apr-toolkit/aprtoolkit.2008.vcproj
@@ -39,6 +39,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="APT_STATIC_LIB"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r

diff --git a/libs/unimrcp/libs/mpf/mpf.2008.vcproj b/libs/unimrcp/libs/mpf/mpf.2008.vcproj
index 556f4f7cb5555514855e9c205e60909efd5ab10c..45f4be011d04a7a788aa559c84b72fe7fc18fcaa 100644 (file)
--- a/libs/unimrcp/libs/mpf/mpf.2008.vcproj
+++ b/libs/unimrcp/libs/mpf/mpf.2008.vcproj
@@ -40,6 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="codecs"\r
+                               PreprocessorDefinitions="APT_STATIC_LIB;MPF_STATIC_LIB"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -192,6 +193,14 @@
                                RelativePath=".\include\mpf_decoder.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\include\mpf_dtmf_detector.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\include\mpf_dtmf_generator.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\include\mpf_encoder.h"\r
                                >\r
@@ -217,17 +226,33 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\include\mpf_media_descriptor.h"\r
+                               RelativePath=".\include\mpf_message.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\include\mpf_mixer.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\include\mpf_message.h"\r
+                               RelativePath=".\include\mpf_multiplier.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\include\mpf_named_event.h"\r
                                >\r
                        </File>\r
                        <File\r
                                RelativePath=".\include\mpf_object.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\include\mpf_resampler.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\include\mpf_rtcp_packet.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\include\mpf_rtp_attribs.h"\r
                                >\r
@@ -244,6 +269,10 @@
                                RelativePath=".\include\mpf_rtp_header.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\include\mpf_rtp_pt.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\include\mpf_rtp_stat.h"\r
                                >\r
@@ -256,12 +285,16 @@
                                RelativePath=".\include\mpf_rtp_termination_factory.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\include\mpf_scheduler.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\include\mpf_stream.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\include\mpf_stream_mode.h"\r
+                               RelativePath=".\include\mpf_stream_descriptor.h"\r
                                >\r
                        </File>\r
                        <File\r
@@ -269,15 +302,15 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\include\mpf_timer.h"\r
+                               RelativePath=".\include\mpf_termination_factory.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\include\mpf_types.h"\r
+                               RelativePath=".\include\mpf_timer_manager.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\include\mpf_user.h"\r
+                               RelativePath=".\include\mpf_types.h"\r
                                >\r
                        </File>\r
                </Filter>\r
@@ -325,6 +358,14 @@
                                RelativePath=".\src\mpf_decoder.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\src\mpf_dtmf_detector.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\src\mpf_dtmf_generator.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\src\mpf_encoder.c"\r
                                >\r
@@ -345,6 +386,22 @@
                                RelativePath=".\src\mpf_jitter_buffer.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\src\mpf_mixer.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\src\mpf_multiplier.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\src\mpf_named_event.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\src\mpf_resampler.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\src\mpf_rtp_attribs.c"\r
                                >\r
@@ -357,12 +414,24 @@
                                RelativePath=".\src\mpf_rtp_termination_factory.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\src\mpf_scheduler.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\src\mpf_stream.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\src\mpf_termination.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\src\mpf_timer.c"\r
+                               RelativePath=".\src\mpf_termination_factory.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\src\mpf_timer_manager.c"\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/libs/unimrcp/libs/mrcp-client/mrcpclient.2008.vcproj b/libs/unimrcp/libs/mrcp-client/mrcpclient.2008.vcproj
index d58072c67fe2ba8282e629cb028646af834a3542..c58ee05eb9d215344854470958da43102310692b 100644 (file)
--- a/libs/unimrcp/libs/mrcp-client/mrcpclient.2008.vcproj
+++ b/libs/unimrcp/libs/mrcp-client/mrcpclient.2008.vcproj
@@ -39,6 +39,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="APT_STATIC_LIB;MPF_STATIC_LIB;MRCP_STATIC_LIB"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r

diff --git a/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.2008.vcproj b/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.2008.vcproj
index bd3b3b59cecec66eb80f8d6b0d25c2c277ac5a61..3b5b7d0bc8061de86a98d623748e9ef8b3eb5151 100644 (file)
--- a/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.2008.vcproj
+++ b/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.2008.vcproj
@@ -39,6 +39,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="APT_STATIC_LIB;MPF_STATIC_LIB;MRCP_STATIC_LIB"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r

diff --git a/libs/unimrcp/libs/mrcp/mrcp.2008.vcproj b/libs/unimrcp/libs/mrcp/mrcp.2008.vcproj
index 6fe61a549effd6282b90f9a313d98a13f5c1d4a5..34f7056547f447df8db84860e3e9e4840d61e4a0 100644 (file)
--- a/libs/unimrcp/libs/mrcp/mrcp.2008.vcproj
+++ b/libs/unimrcp/libs/mrcp/mrcp.2008.vcproj
@@ -40,6 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="APT_STATIC_LIB;MPF_STATIC_LIB;MRCP_STATIC_LIB"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -160,6 +161,10 @@
                                        RelativePath=".\message\include\mrcp_message.h"\r
                                        >\r
                                </File>\r
+                               <File\r
+                                       RelativePath=".\message\include\mrcp_start_line.h"\r
+                                       >\r
+                               </File>\r
                        </Filter>\r
                        <Filter\r
                                Name="src"\r
@@ -177,6 +182,10 @@
                                        RelativePath=".\message\src\mrcp_message.c"\r
                                        >\r
                                </File>\r
+                               <File\r
+                                       RelativePath=".\message\src\mrcp_start_line.c"\r
+                                       >\r
+                               </File>\r
                        </Filter>\r
                </Filter>\r
                <Filter\r
@@ -195,7 +204,7 @@
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath=".\control\include\mrcp_state_machine.h"\r
+                                       RelativePath=".\control\include\mrcp_resource_loader.h"\r
                                        >\r
                                </File>\r
                                <File\r
@@ -211,6 +220,10 @@
                                        RelativePath=".\control\src\mrcp_resource_factory.c"\r
                                        >\r
                                </File>\r
+                               <File\r
+                                       RelativePath=".\control\src\mrcp_resource_loader.c"\r
+                                       >\r
+                               </File>\r
                                <File\r
                                        RelativePath=".\control\src\mrcp_stream.c"\r
                                        >\r
@@ -224,10 +237,6 @@
                                Name="include"\r
                                Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
                                >\r
-                               <File\r
-                                       RelativePath=".\resources\include\mrcp_default_factory.h"\r
-                                       >\r
-                               </File>\r
                                <File\r
                                        RelativePath=".\resources\include\mrcp_recog_header.h"\r
                                        >\r
@@ -237,19 +246,19 @@
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath=".\resources\include\mrcp_recog_state_machine.h"\r
+                                       RelativePath=".\resources\include\mrcp_recorder_header.h"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath=".\resources\include\mrcp_synth_header.h"\r
+                                       RelativePath=".\resources\include\mrcp_recorder_resource.h"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath=".\resources\include\mrcp_synth_resource.h"\r
+                                       RelativePath=".\resources\include\mrcp_synth_header.h"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath=".\resources\include\mrcp_synth_state_machine.h"\r
+                                       RelativePath=".\resources\include\mrcp_synth_resource.h"\r
                                        >\r
                                </File>\r
                        </Filter>\r
@@ -257,14 +266,6 @@
                                Name="src"\r
                                Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                                >\r
-                               <File\r
-                                       RelativePath=".\resources\src\mrcp_default_factory.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\resources\src\mrcp_recog_client_state_machine.c"\r
-                                       >\r
-                               </File>\r
                                <File\r
                                        RelativePath=".\resources\src\mrcp_recog_header.c"\r
                                        >\r
@@ -274,11 +275,11 @@
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath=".\resources\src\mrcp_recog_server_state_machine.c"\r
+                                       RelativePath=".\resources\src\mrcp_recorder_header.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath=".\resources\src\mrcp_synth_client_state_machine.c"\r
+                                       RelativePath=".\resources\src\mrcp_recorder_resource.c"\r
                                        >\r
                                </File>\r
                                <File\r
@@ -289,10 +290,6 @@
                                        RelativePath=".\resources\src\mrcp_synth_resource.c"\r
                                        >\r
                                </File>\r
-                               <File\r
-                                       RelativePath=".\resources\src\mrcp_synth_server_state_machine.c"\r
-                                       >\r
-                               </File>\r
                        </Filter>\r
                </Filter>\r
        </Files>\r

diff --git a/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.2008.vcproj b/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.2008.vcproj
index d5d476181dc3fc0e1338201d09e2a832f763b5e1..0896c21109ab3c7a7138b919ea95459e2814ae0a 100644 (file)
--- a/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.2008.vcproj
+++ b/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.2008.vcproj
@@ -39,6 +39,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="APT_STATIC_LIB;MPF_STATIC_LIB;MRCP_STATIC_LIB"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r

diff --git a/libs/unimrcp/libs/uni-rtsp/unirtsp.2008.vcproj b/libs/unimrcp/libs/uni-rtsp/unirtsp.2008.vcproj
index 22da8b23e0e0a39803e626824bc1722a99abd8db..46a04f6cb8c72d79b7a9a243b8f2a2e30c226f9a 100644 (file)
--- a/libs/unimrcp/libs/uni-rtsp/unirtsp.2008.vcproj
+++ b/libs/unimrcp/libs/uni-rtsp/unirtsp.2008.vcproj
@@ -40,6 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="codecs"\r
+                               PreprocessorDefinitions="APT_STATIC_LIB"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r

diff --git a/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.2008.vcproj b/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.2008.vcproj
index 22df958efde7e3b23e641369c581e121e07dbefd..7b858140f750a90a1cd3577c4b4876f245a9bd63 100644 (file)
--- a/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.2008.vcproj
+++ b/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.2008.vcproj
@@ -40,6 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="include"\r
+                               PreprocessorDefinitions="APT_STATIC_LIB;MPF_STATIC_LIB;MRCP_STATIC_LIB;LIBSOFIA_SIP_UA_STATIC"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r

diff --git a/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.2008.vcproj b/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.2008.vcproj
index 065bab74365117a64c5d82075e8be040b05b19ec..70902908f254073cf91b56aea6dc758a7556ad45 100644 (file)
--- a/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.2008.vcproj
+++ b/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.2008.vcproj
@@ -40,6 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="include"\r
+                               PreprocessorDefinitions="APT_STATIC_LIB;RTSP_STATIC_LIB;MPF_STATIC_LIB;MRCP_STATIC_LIB;LIBSOFIA_SIP_UA_STATIC"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r

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 d00b6ffe03c88c7e63144d7e7953504536584acd..d5ff2948ef15c5675bde8e13629655d51e7a54d3 100644 (file)
--- 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>\r
                <Configuration\r
                        Name="Debug|Win32"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;.\unimrcp.vsprops"\r
                        CharacterSet="2"\r
@@ -42,6 +43,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="APT_STATIC_LIB;MPF_STATIC_LIB;MRCP_STATIC_LIB;LIBSOFIA_SIP_UA_STATIC"\r
                                UsePrecompiledHeader="0"\r
                        />\r
                        <Tool\r
@@ -55,6 +57,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalLibraryDirectories="$(SolutionDir)Debug/bin"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
                        />\r
@@ -82,6 +85,7 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|x64"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;.\unimrcp.vsprops"\r
                        CharacterSet="2"\r

diff --git a/src/mod/asr_tts/mod_unimrcp/unimrcp.vsprops b/src/mod/asr_tts/mod_unimrcp/unimrcp.vsprops
index 44475fc62242e2b244c2152c96e96a0b3c4e4e6c..359408084a93dbca3dea08051248a0d1509b3e56 100644 (file)
--- a/src/mod/asr_tts/mod_unimrcp/unimrcp.vsprops
+++ b/src/mod/asr_tts/mod_unimrcp/unimrcp.vsprops
@@ -7,7 +7,7 @@
        >\r
        <Tool\r
                Name="VCCLCompilerTool"\r
-               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;"\r
-               PreprocessorDefinitions=""\r
+               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;"\r
+               PreprocessorDefinitions="MRCP_STATIC_LIB MPF_STATIC_LIB APT_STATIC_LIB"\r
        />\r
 </VisualStudioPropertySheet>\r