Skip to content

F
freeswitch
提交 1c6b7d81 authored 作者: Jeff Lenk's avatar Jeff Lenk
浏览文件
操作

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

上级 a94a3cba
隐藏空白字符变更
内嵌 并排
正在显示 包含 21 行增加 和 31 行删除
libs/apr-util/xml/expat/lib/config.hnw
浏览文件 @ 1c6b7d81
...@@ -19,6 +19,5 @@ ...@@ -19,6 +19,5 @@
#define XML_DTD 1 #define XML_DTD 1
#define XML_BYTE_ORDER 12 #define XML_BYTE_ORDER 12
#define XML_CONTEXT_BYTES 1024 #define XML_CONTEXT_BYTES 1024
#define VERSION 1
#endif /* ndef CONFIG_HNW */ #endif /* ndef CONFIG_HNW */
libs/unimrcp/libs/apr-toolkit/aprtoolkit.2010.vcxproj
浏览文件 @ 1c6b7d81
...@@ -110,40 +110,46 @@ ...@@ -110,40 +110,46 @@
<ClInclude Include="include\apt_consumer_task.h" /> <ClInclude Include="include\apt_consumer_task.h" />
<ClInclude Include="include\apt_cyclic_queue.h" /> <ClInclude Include="include\apt_cyclic_queue.h" />
<ClInclude Include="include\apt_dir_layout.h" /> <ClInclude Include="include\apt_dir_layout.h" />
<ClInclude Include="include\apt_header_field.h" />
<ClInclude Include="include\apt_log.h" /> <ClInclude Include="include\apt_log.h" />
<ClInclude Include="include\apt_multipart_content.h" />
<ClInclude Include="include\apt_net.h" /> <ClInclude Include="include\apt_net.h" />
<ClInclude Include="include\apt_net_client_task.h" />
<ClInclude Include="include\apt_net_server_task.h" />
<ClInclude Include="include\apt_nlsml_doc.h" /> <ClInclude Include="include\apt_nlsml_doc.h" />
<ClInclude Include="include\apt_obj_list.h" /> <ClInclude Include="include\apt_obj_list.h" />
<ClInclude Include="include\apt_pair.h" /> <ClInclude Include="include\apt_pair.h" />
<ClInclude Include="include\apt_pollset.h" /> <ClInclude Include="include\apt_pollset.h" />
<ClInclude Include="include\apt_poller_task.h" />
<ClInclude Include="include\apt_pool.h" /> <ClInclude Include="include\apt_pool.h" />
<ClInclude Include="include\apt_string.h" /> <ClInclude Include="include\apt_string.h" />
<ClInclude Include="include\apt_string_table.h" /> <ClInclude Include="include\apt_string_table.h" />
<ClInclude Include="include\apt_task.h" /> <ClInclude Include="include\apt_task.h" />
<ClInclude Include="include\apt_task_msg.h" /> <ClInclude Include="include\apt_task_msg.h" />
<ClInclude Include="include\apt_test_suite.h" /> <ClInclude Include="include\apt_test_suite.h" />
<ClInclude Include="include\apt_text_message.h" />
<ClInclude Include="include\apt_text_stream.h" /> <ClInclude Include="include\apt_text_stream.h" />
<ClInclude Include="include\apt_time_queue.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\apt_consumer_task.c" /> <ClCompile Include="src\apt_consumer_task.c" />
<ClCompile Include="src\apt_cyclic_queue.c" /> <ClCompile Include="src\apt_cyclic_queue.c" />
<ClCompile Include="src\apt_dir_layout.c" /> <ClCompile Include="src\apt_dir_layout.c" />
<ClCompile Include="src\apt_header_field.c" />
<ClCompile Include="src\apt_log.c" /> <ClCompile Include="src\apt_log.c" />
<ClCompile Include="src\apt_multipart_content.c" />
<ClCompile Include="src\apt_net.c" /> <ClCompile Include="src\apt_net.c" />
<ClCompile Include="src\apt_net_client_task.c" />
<ClCompile Include="src\apt_net_server_task.c" />
<ClCompile Include="src\apt_nlsml_doc.c" /> <ClCompile Include="src\apt_nlsml_doc.c" />
<ClCompile Include="src\apt_obj_list.c" /> <ClCompile Include="src\apt_obj_list.c" />
<ClCompile Include="src\apt_pair.c" /> <ClCompile Include="src\apt_pair.c" />
<ClCompile Include="src\apt_poller_task.c" />
<ClCompile Include="src\apt_pollset.c" /> <ClCompile Include="src\apt_pollset.c" />
<ClCompile Include="src\apt_pool.c" /> <ClCompile Include="src\apt_pool.c" />
<ClCompile Include="src\apt_string_table.c" /> <ClCompile Include="src\apt_string_table.c" />
<ClCompile Include="src\apt_task.c" /> <ClCompile Include="src\apt_task.c" />
<ClCompile Include="src\apt_task_msg.c" /> <ClCompile Include="src\apt_task_msg.c" />
<ClCompile Include="src\apt_test_suite.c" /> <ClCompile Include="src\apt_test_suite.c" />
<ClCompile Include="src\apt_text_message.c" />
<ClCompile Include="src\apt_text_stream.c" /> <ClCompile Include="src\apt_text_stream.c" />
<ClCompile Include="src\apt_timer_queue.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\win32\apr-util\libaprutil.2010.vcxproj"> <ProjectReference Include="..\..\..\win32\apr-util\libaprutil.2010.vcxproj">
......
libs/unimrcp/libs/mpf/mpf.2010.vcxproj
浏览文件 @ 1c6b7d81
...@@ -141,7 +141,6 @@ ...@@ -141,7 +141,6 @@
<ClCompile Include="src\mpf_stream.c" /> <ClCompile Include="src\mpf_stream.c" />
<ClCompile Include="src\mpf_termination.c" /> <ClCompile Include="src\mpf_termination.c" />
<ClCompile Include="src\mpf_termination_factory.c" /> <ClCompile Include="src\mpf_termination_factory.c" />
<ClCompile Include="src\mpf_timer_manager.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="codecs\g711\g711.h" /> <ClInclude Include="codecs\g711\g711.h" />
...@@ -184,7 +183,6 @@ ...@@ -184,7 +183,6 @@
<ClInclude Include="include\mpf_stream_descriptor.h" /> <ClInclude Include="include\mpf_stream_descriptor.h" />
<ClInclude Include="include\mpf_termination.h" /> <ClInclude Include="include\mpf_termination.h" />
<ClInclude Include="include\mpf_termination_factory.h" /> <ClInclude Include="include\mpf_termination_factory.h" />
<ClInclude Include="include\mpf_timer_manager.h" />
<ClInclude Include="include\mpf_types.h" /> <ClInclude Include="include\mpf_types.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
......
libs/unimrcp/libs/mrcp-client/mrcpclient.2010.vcxproj
浏览文件 @ 1c6b7d81
...@@ -112,6 +112,7 @@ ...@@ -112,6 +112,7 @@
<ClInclude Include="include\mrcp_client_types.h" /> <ClInclude Include="include\mrcp_client_types.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\mrcp_application.c" />
<ClCompile Include="src\mrcp_client.c" /> <ClCompile Include="src\mrcp_client.c" />
<ClCompile Include="src\mrcp_client_session.c" /> <ClCompile Include="src\mrcp_client_session.c" />
</ItemGroup> </ItemGroup>
......
libs/unimrcp/libs/mrcp/mrcp.2010.vcxproj
浏览文件 @ 1c6b7d81
...@@ -113,6 +113,7 @@ ...@@ -113,6 +113,7 @@
<ClInclude Include="include\mrcp.h" /> <ClInclude Include="include\mrcp.h" />
<ClInclude Include="include\mrcp_types.h" /> <ClInclude Include="include\mrcp_types.h" />
<ClInclude Include="message\include\mrcp_generic_header.h" /> <ClInclude Include="message\include\mrcp_generic_header.h" />
<ClInclude Include="message\include\mrcp__header.h" />
<ClInclude Include="message\include\mrcp_header_accessor.h" /> <ClInclude Include="message\include\mrcp_header_accessor.h" />
<ClInclude Include="message\include\mrcp_message.h" /> <ClInclude Include="message\include\mrcp_message.h" />
<ClInclude Include="message\include\mrcp_start_line.h" /> <ClInclude Include="message\include\mrcp_start_line.h" />
...@@ -126,9 +127,12 @@ ...@@ -126,9 +127,12 @@
<ClInclude Include="resources\include\mrcp_recorder_resource.h" /> <ClInclude Include="resources\include\mrcp_recorder_resource.h" />
<ClInclude Include="resources\include\mrcp_synth_header.h" /> <ClInclude Include="resources\include\mrcp_synth_header.h" />
<ClInclude Include="resources\include\mrcp_synth_resource.h" /> <ClInclude Include="resources\include\mrcp_synth_resource.h" />
<ClInclude Include="resources\include\mrcp_verifier_header.h" />
<ClInclude Include="resources\include\mrcp_verifier_resource.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="message\src\mrcp_generic_header.c" /> <ClCompile Include="message\src\mrcp_generic_header.c" />
<ClCompile Include="message\src\mrcp_header.c" />
<ClCompile Include="message\src\mrcp_header_accessor.c" /> <ClCompile Include="message\src\mrcp_header_accessor.c" />
<ClCompile Include="message\src\mrcp_message.c" /> <ClCompile Include="message\src\mrcp_message.c" />
<ClCompile Include="message\src\mrcp_start_line.c" /> <ClCompile Include="message\src\mrcp_start_line.c" />
...@@ -141,6 +145,8 @@ ...@@ -141,6 +145,8 @@
<ClCompile Include="resources\src\mrcp_recorder_resource.c" /> <ClCompile Include="resources\src\mrcp_recorder_resource.c" />
<ClCompile Include="resources\src\mrcp_synth_header.c" /> <ClCompile Include="resources\src\mrcp_synth_header.c" />
<ClCompile Include="resources\src\mrcp_synth_resource.c" /> <ClCompile Include="resources\src\mrcp_synth_resource.c" />
<ClCompile Include="resources\src\mrcp_verifier_header.c" />
<ClCompile Include="resources\src\mrcp_verifier_resource.c" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
......
libs/win32/apr-util/libaprutil.2008.vcproj
浏览文件 @ 1c6b7d81
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/EHsc " AdditionalOptions="/EHsc "
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="&quot;..\..\apr-util\include&quot;;&quot;..\..\apr-util\include/private&quot;;&quot;..\..\apr-util\dbm/sdbm&quot;;&quot;..\..\apr-util\xml\expat\lib&quot;;&quot;..\..\apr-iconv-1.1.1\include&quot;;..\..\apr\include" AdditionalIncludeDirectories="&quot;..\..\apr-util\include&quot;;&quot;..\..\apr-util\include/private&quot;;&quot;..\..\apr-util\dbm/sdbm&quot;;&quot;..\..\apr-iconv-1.1.1\include&quot;;..\..\apr\include"
PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS" PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"
RuntimeLibrary="3" RuntimeLibrary="3"
PrecompiledHeaderFile="$(IntDir)/libaprutil.pch" PrecompiledHeaderFile="$(IntDir)/libaprutil.pch"
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/EHsc " AdditionalOptions="/EHsc "
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="&quot;..\..\apr-util\include&quot;;&quot;..\..\apr-util\include/private&quot;;&quot;..\..\apr-util\dbm/sdbm&quot;;&quot;..\..\apr-util\xml\expat\lib&quot;;&quot;..\..\apr-iconv-1.1.1\include&quot;;..\..\apr\include" AdditionalIncludeDirectories="&quot;..\..\apr-util\include&quot;;&quot;..\..\apr-util\include/private&quot;;&quot;..\..\apr-util\dbm/sdbm&quot;;&quot;..\..\apr-iconv-1.1.1\include&quot;;..\..\apr\include"
PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS" PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"
RuntimeLibrary="3" RuntimeLibrary="3"
PrecompiledHeaderFile="$(IntDir)/libaprutil.pch" PrecompiledHeaderFile="$(IntDir)/libaprutil.pch"
...@@ -246,7 +246,7 @@ ...@@ -246,7 +246,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="&quot;..\..\apr-util\include&quot;;&quot;..\..\apr-util\include/private&quot;;&quot;..\..\apr-util\dbm/sdbm&quot;;&quot;..\..\apr-util\xml\expat\lib&quot;;&quot;..\..\apr-iconv-1.1.1\include&quot;;..\..\apr\include" AdditionalIncludeDirectories="&quot;..\..\apr-util\include&quot;;&quot;..\..\apr-util\include/private&quot;;&quot;..\..\apr-util\dbm/sdbm&quot;;&quot;..\..\apr-iconv-1.1.1\include&quot;;..\..\apr\include"
PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS" PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="2"
...@@ -347,7 +347,7 @@ ...@@ -347,7 +347,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="&quot;..\..\apr-util\include&quot;;&quot;..\..\apr-util\include/private&quot;;&quot;..\..\apr-util\dbm/sdbm&quot;;&quot;..\..\apr-util\xml\expat\lib&quot;;&quot;..\..\apr-iconv-1.1.1\include&quot;;..\..\apr\include" AdditionalIncludeDirectories="&quot;..\..\apr-util\include&quot;;&quot;..\..\apr-util\include/private&quot;;&quot;..\..\apr-util\dbm/sdbm&quot;;&quot;..\..\apr-iconv-1.1.1\include&quot;;..\..\apr\include"
PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS" PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="2"
...@@ -2391,26 +2391,6 @@ ...@@ -2391,26 +2391,6 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
</Filter> </Filter>
<Filter
Name="xml"
>
<File
RelativePath="..\..\apr-util\xml\apr_xml.c"
>
</File>
<File
RelativePath="..\..\apr-util\xml\expat\lib\xmlparse.c"
>
</File>
<File
RelativePath="..\..\apr-util\xml\expat\lib\xmlrole.c"
>
</File>
<File
RelativePath="..\..\apr-util\xml\expat\lib\xmltok.c"
>
</File>
</Filter>
</Filter> </Filter>
<Filter <Filter
Name="Generated Files" Name="Generated Files"
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论