unimrcp vs2010 upgrade with revert of incorrect 2008 changes - still not working

diff --git a/libs/apr-util/xml/expat/lib/config.hnw b/libs/apr-util/xml/expat/lib/config.hnw
index 0878fa208b7ad8ddde67996b7bf1a39218cfe6c2..de129d343c8ac20342ea98fa0160a6be95e37654 100644 (file)
--- a/libs/apr-util/xml/expat/lib/config.hnw
+++ b/libs/apr-util/xml/expat/lib/config.hnw
@@ -19,6 +19,5 @@
 #define XML_DTD 1
 #define XML_BYTE_ORDER 12
 #define XML_CONTEXT_BYTES 1024
-#define VERSION 1
 
 #endif /* ndef CONFIG_HNW */

diff --git a/libs/unimrcp/libs/apr-toolkit/aprtoolkit.2010.vcxproj b/libs/unimrcp/libs/apr-toolkit/aprtoolkit.2010.vcxproj
index 9288736c401df20d0bb8afb8d581ec63682aca04..5a8627dbffe74f3b564211e6ccee29542fd44094 100644 (file)
--- a/libs/unimrcp/libs/apr-toolkit/aprtoolkit.2010.vcxproj
+++ b/libs/unimrcp/libs/apr-toolkit/aprtoolkit.2010.vcxproj
@@ -110,40 +110,46 @@
     <ClInclude Include="include\apt_consumer_task.h" />\r
     <ClInclude Include="include\apt_cyclic_queue.h" />\r
     <ClInclude Include="include\apt_dir_layout.h" />\r
+    <ClInclude Include="include\apt_header_field.h" />\r
     <ClInclude Include="include\apt_log.h" />\r
+    <ClInclude Include="include\apt_multipart_content.h" />\r
     <ClInclude Include="include\apt_net.h" />\r
-    <ClInclude Include="include\apt_net_client_task.h" />\r
-    <ClInclude Include="include\apt_net_server_task.h" />\r
     <ClInclude Include="include\apt_nlsml_doc.h" />\r
     <ClInclude Include="include\apt_obj_list.h" />\r
     <ClInclude Include="include\apt_pair.h" />\r
     <ClInclude Include="include\apt_pollset.h" />\r
+    <ClInclude Include="include\apt_poller_task.h" />\r
     <ClInclude Include="include\apt_pool.h" />\r
     <ClInclude Include="include\apt_string.h" />\r
     <ClInclude Include="include\apt_string_table.h" />\r
     <ClInclude Include="include\apt_task.h" />\r
     <ClInclude Include="include\apt_task_msg.h" />\r
     <ClInclude Include="include\apt_test_suite.h" />\r
+    <ClInclude Include="include\apt_text_message.h" />\r
     <ClInclude Include="include\apt_text_stream.h" />\r
+    <ClInclude Include="include\apt_time_queue.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="src\apt_consumer_task.c" />\r
     <ClCompile Include="src\apt_cyclic_queue.c" />\r
     <ClCompile Include="src\apt_dir_layout.c" />\r
+    <ClCompile Include="src\apt_header_field.c" />\r
     <ClCompile Include="src\apt_log.c" />\r
+    <ClCompile Include="src\apt_multipart_content.c" />\r
     <ClCompile Include="src\apt_net.c" />\r
-    <ClCompile Include="src\apt_net_client_task.c" />\r
-    <ClCompile Include="src\apt_net_server_task.c" />\r
     <ClCompile Include="src\apt_nlsml_doc.c" />\r
     <ClCompile Include="src\apt_obj_list.c" />\r
     <ClCompile Include="src\apt_pair.c" />\r
+    <ClCompile Include="src\apt_poller_task.c" />\r
     <ClCompile Include="src\apt_pollset.c" />\r
     <ClCompile Include="src\apt_pool.c" />\r
     <ClCompile Include="src\apt_string_table.c" />\r
     <ClCompile Include="src\apt_task.c" />\r
     <ClCompile Include="src\apt_task_msg.c" />\r
     <ClCompile Include="src\apt_test_suite.c" />\r
+    <ClCompile Include="src\apt_text_message.c" />\r
     <ClCompile Include="src\apt_text_stream.c" />\r
+    <ClCompile Include="src\apt_timer_queue.c" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ProjectReference Include="..\..\..\win32\apr-util\libaprutil.2010.vcxproj">\r

diff --git a/libs/unimrcp/libs/mpf/mpf.2010.vcxproj b/libs/unimrcp/libs/mpf/mpf.2010.vcxproj
index 1b48acef80ce382a55f8d00eb8b7f8d5ebbce01b..2a89b638c5db2a89e7ce0470340e1635ae1375be 100644 (file)
--- a/libs/unimrcp/libs/mpf/mpf.2010.vcxproj
+++ b/libs/unimrcp/libs/mpf/mpf.2010.vcxproj
@@ -141,7 +141,6 @@
     <ClCompile Include="src\mpf_stream.c" />\r
     <ClCompile Include="src\mpf_termination.c" />\r
     <ClCompile Include="src\mpf_termination_factory.c" />\r
-    <ClCompile Include="src\mpf_timer_manager.c" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="codecs\g711\g711.h" />\r
@@ -184,7 +183,6 @@
     <ClInclude Include="include\mpf_stream_descriptor.h" />\r
     <ClInclude Include="include\mpf_termination.h" />\r
     <ClInclude Include="include\mpf_termination_factory.h" />\r
-    <ClInclude Include="include\mpf_timer_manager.h" />\r
     <ClInclude Include="include\mpf_types.h" />\r
   </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r

diff --git a/libs/unimrcp/libs/mrcp-client/mrcpclient.2010.vcxproj b/libs/unimrcp/libs/mrcp-client/mrcpclient.2010.vcxproj
index 1c861d58b5ba50ebed92da260150e04d59d18fc5..7a9d7856c6e2757efbe6ce74a98ad478ea087a74 100644 (file)
--- a/libs/unimrcp/libs/mrcp-client/mrcpclient.2010.vcxproj
+++ b/libs/unimrcp/libs/mrcp-client/mrcpclient.2010.vcxproj
@@ -112,6 +112,7 @@
     <ClInclude Include="include\mrcp_client_types.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
+    <ClCompile Include="src\mrcp_application.c" />\r
     <ClCompile Include="src\mrcp_client.c" />\r
     <ClCompile Include="src\mrcp_client_session.c" />\r
   </ItemGroup>\r

diff --git a/libs/unimrcp/libs/mrcp/mrcp.2010.vcxproj b/libs/unimrcp/libs/mrcp/mrcp.2010.vcxproj
index e525a961462ff269c23165bd85024358fb4fa68b..ed2c29bbf8dad47984bb9b20bcff9274f30b9846 100644 (file)
--- a/libs/unimrcp/libs/mrcp/mrcp.2010.vcxproj
+++ b/libs/unimrcp/libs/mrcp/mrcp.2010.vcxproj
@@ -113,6 +113,7 @@
     <ClInclude Include="include\mrcp.h" />\r
     <ClInclude Include="include\mrcp_types.h" />\r
     <ClInclude Include="message\include\mrcp_generic_header.h" />\r
+    <ClInclude Include="message\include\mrcp__header.h" />\r
     <ClInclude Include="message\include\mrcp_header_accessor.h" />\r
     <ClInclude Include="message\include\mrcp_message.h" />\r
     <ClInclude Include="message\include\mrcp_start_line.h" />\r
@@ -126,9 +127,12 @@
     <ClInclude Include="resources\include\mrcp_recorder_resource.h" />\r
     <ClInclude Include="resources\include\mrcp_synth_header.h" />\r
     <ClInclude Include="resources\include\mrcp_synth_resource.h" />\r
+    <ClInclude Include="resources\include\mrcp_verifier_header.h" />\r
+    <ClInclude Include="resources\include\mrcp_verifier_resource.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="message\src\mrcp_generic_header.c" />\r
+    <ClCompile Include="message\src\mrcp_header.c" />\r
     <ClCompile Include="message\src\mrcp_header_accessor.c" />\r
     <ClCompile Include="message\src\mrcp_message.c" />\r
     <ClCompile Include="message\src\mrcp_start_line.c" />\r
@@ -141,6 +145,8 @@
     <ClCompile Include="resources\src\mrcp_recorder_resource.c" />\r
     <ClCompile Include="resources\src\mrcp_synth_header.c" />\r
     <ClCompile Include="resources\src\mrcp_synth_resource.c" />\r
+    <ClCompile Include="resources\src\mrcp_verifier_header.c" />\r
+    <ClCompile Include="resources\src\mrcp_verifier_resource.c" />\r
   </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r

diff --git a/libs/win32/apr-util/libaprutil.2008.vcproj b/libs/win32/apr-util/libaprutil.2008.vcproj
index 9125bcb5ac1eb0d9d152b616b0076ef71b1f8553..971b97e8d40875045dce19a3b14be47280b85328 100644 (file)
--- a/libs/win32/apr-util/libaprutil.2008.vcproj
+++ b/libs/win32/apr-util/libaprutil.2008.vcproj
@@ -52,7 +52,7 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/EHsc "\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-util\xml\expat\lib";"..\..\apr-iconv-1.1.1\include";..\..\apr\include"\r
+                               AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-iconv-1.1.1\include";..\..\apr\include"\r
                                PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"\r
                                RuntimeLibrary="3"\r
                                PrecompiledHeaderFile="$(IntDir)/libaprutil.pch"\r
@@ -150,7 +150,7 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/EHsc "\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-util\xml\expat\lib";"..\..\apr-iconv-1.1.1\include";..\..\apr\include"\r
+                               AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-iconv-1.1.1\include";..\..\apr\include"\r
                                PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"\r
                                RuntimeLibrary="3"\r
                                PrecompiledHeaderFile="$(IntDir)/libaprutil.pch"\r
@@ -246,7 +246,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-util\xml\expat\lib";"..\..\apr-iconv-1.1.1\include";..\..\apr\include"\r
+                               AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-iconv-1.1.1\include";..\..\apr\include"\r
                                PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"\r
                                StringPooling="true"\r
                                RuntimeLibrary="2"\r
@@ -347,7 +347,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-util\xml\expat\lib";"..\..\apr-iconv-1.1.1\include";..\..\apr\include"\r
+                               AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-iconv-1.1.1\include";..\..\apr\include"\r
                                PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"\r
                                StringPooling="true"\r
                                RuntimeLibrary="2"\r
@@ -2391,26 +2391,6 @@
                                        </FileConfiguration>\r
                                </File>\r
                        </Filter>\r
-                       <Filter\r
-                               Name="xml"\r
-                               >\r
-                               <File\r
-                                       RelativePath="..\..\apr-util\xml\apr_xml.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\apr-util\xml\expat\lib\xmlparse.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\apr-util\xml\expat\lib\xmlrole.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\apr-util\xml\expat\lib\xmltok.c"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
                </Filter>\r
                <Filter\r
                        Name="Generated Files"\r