external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

merge srs_app_st_socket to srs_app_st.

Browse source
This commit is contained in:
winlin 2015-06-14 08:43:38 +08:00
parent 17c276113e
commit baa892a762
20 changed files with 207 additions and 284 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/ide/srs_vs2010/srs.vcxproj
View file

@ -95,7 +95,6 @@
<ClInclude Include="..\..\src\app\srs_app_source.hpp" />
<ClInclude Include="..\..\src\app\srs_app_st.hpp" />
<ClInclude Include="..\..\src\app\srs_app_statistic.hpp" />
<ClInclude Include="..\..\src\app\srs_app_st_socket.hpp" />
<ClInclude Include="..\..\src\app\srs_app_thread.hpp" />
<ClInclude Include="..\..\src\app\srs_app_utility.hpp" />
<ClInclude Include="..\..\src\core\srs_core.hpp" />
@ -176,7 +175,6 @@
<ClCompile Include="..\..\src\app\srs_app_source.cpp" />
<ClCompile Include="..\..\src\app\srs_app_st.cpp" />
<ClCompile Include="..\..\src\app\srs_app_statistic.cpp" />
<ClCompile Include="..\..\src\app\srs_app_st_socket.cpp" />
<ClCompile Include="..\..\src\app\srs_app_thread.cpp" />
<ClCompile Include="..\..\src\app\srs_app_utility.cpp" />
<ClCompile Include="..\..\src\core\srs_core.cpp" />

6
trunk/ide/srs_vs2010/srs.vcxproj.filters
View file

@ -103,9 +103,6 @@
<ClCompile Include="..\..\src\app\srs_app_st.cpp">
<Filter>srs</Filter>
</ClCompile>
<ClCompile Include="..\..\src\app\srs_app_st_socket.cpp">
<Filter>srs</Filter>
</ClCompile>
<ClCompile Include="..\..\src\app\srs_app_statistic.cpp">
<Filter>srs</Filter>
</ClCompile>
@ -327,9 +324,6 @@
<ClInclude Include="..\..\src\app\srs_app_st.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\app\srs_app_st_socket.hpp">
<Filter>srs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\app\srs_app_statistic.hpp">
<Filter>srs</Filter>
</ClInclude>