更新VC2012项目文件.

Signed-off-by: Jack <[email protected]>
loveq369 · Mar 5, 2013 · c3b497f · c3b497f
1 parent f8a9f7c
commit c3b497f
Show file tree

Hide file tree

Showing 13 changed files with 1,058 additions and 45 deletions.
diff --git a/audio/audio.vcxproj.filters b/audio/audio.vcxproj.filters
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="audio_out.cpp">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="dsound_render.cpp">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="wave_render.cpp">
+      <Filter>source</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="audio_out.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="audio_render.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="dsound_render.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="audiocvt.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="ins.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="wave_render.h">
+      <Filter>include</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="include">
+      <UniqueIdentifier>{3f430ef3-f6c8-4b69-9fd5-ca52f8e8993f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="source">
+      <UniqueIdentifier>{6de7fcce-612b-4e9f-b117-1119979a7a23}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+</Project>
diff --git a/avplay_vc2012.sln b/avplay_vc2012.sln
@@ -5,8 +5,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video", "video\video.vcxpro
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "audio", "audio\audio.vcxproj", "{BC5E9C1A-C689-4298-A8EA-2856457DAC28}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "source", "source\source.vcxproj", "{C3812E93-D5DE-4275-9E57-62513C4FAC32}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libav", "libav\libav.vcxproj", "{457C2989-509D-4132-B08A-1695342BB9DB}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtorrent", "libtorrent\include\libtorrent.vcxproj", "{0795F713-7B86-4250-8B4E-4F4663AF6956}"
@@ -17,6 +15,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "avplayer", "win32\avplayer\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libyk", "libyk\libyk.vcxproj", "{46CD66DB-40A1-4677-91B4-F3226FAB8941}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "source", "source\source.vcxproj", "{C3812E93-D5DE-4275-9E57-62513C4FAC32}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -31,10 +31,6 @@ Global
 		{BC5E9C1A-C689-4298-A8EA-2856457DAC28}.Debug|Win32.Build.0 = Debug|Win32
 		{BC5E9C1A-C689-4298-A8EA-2856457DAC28}.Release|Win32.ActiveCfg = Release|Win32
 		{BC5E9C1A-C689-4298-A8EA-2856457DAC28}.Release|Win32.Build.0 = Release|Win32
-		{C3812E93-D5DE-4275-9E57-62513C4FAC32}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C3812E93-D5DE-4275-9E57-62513C4FAC32}.Debug|Win32.Build.0 = Debug|Win32
-		{C3812E93-D5DE-4275-9E57-62513C4FAC32}.Release|Win32.ActiveCfg = Release|Win32
-		{C3812E93-D5DE-4275-9E57-62513C4FAC32}.Release|Win32.Build.0 = Release|Win32
 		{457C2989-509D-4132-B08A-1695342BB9DB}.Debug|Win32.ActiveCfg = Debug|Win32
 		{457C2989-509D-4132-B08A-1695342BB9DB}.Debug|Win32.Build.0 = Debug|Win32
 		{457C2989-509D-4132-B08A-1695342BB9DB}.Release|Win32.ActiveCfg = Release|Win32
@@ -55,6 +51,10 @@ Global
 		{46CD66DB-40A1-4677-91B4-F3226FAB8941}.Debug|Win32.Build.0 = Debug|Win32
 		{46CD66DB-40A1-4677-91B4-F3226FAB8941}.Release|Win32.ActiveCfg = Release|Win32
 		{46CD66DB-40A1-4677-91B4-F3226FAB8941}.Release|Win32.Build.0 = Release|Win32
+		{C3812E93-D5DE-4275-9E57-62513C4FAC32}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C3812E93-D5DE-4275-9E57-62513C4FAC32}.Debug|Win32.Build.0 = Debug|Win32
+		{C3812E93-D5DE-4275-9E57-62513C4FAC32}.Release|Win32.ActiveCfg = Release|Win32
+		{C3812E93-D5DE-4275-9E57-62513C4FAC32}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/libav/libav.vcxproj.filters b/libav/libav.vcxproj.filters
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClInclude Include="globals.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="avplay.h">
+      <Filter>include</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="source">
+      <UniqueIdentifier>{2cbd1fd8-62c6-4084-b24c-98e91e142d4e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include">
+      <UniqueIdentifier>{dd1d3195-d98d-4834-9739-f6e163cb471e}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="avplay.c">
+      <Filter>source</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
diff --git a/libtorrent/include/libtorrent.vcxproj b/libtorrent/include/libtorrent.vcxproj
@@ -52,7 +52,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.;.\libtorrent;..\..\third_party\openssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x0501;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;BOOST_ASIO_SEPARATE_COMPILATION;BOOST_ASIO_ENABLE_CANCELIO;TORRENT_USE_OPENSSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x0501;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;BOOST_ASIO_ENABLE_CANCELIO;BOOST_ASIO_DYN_LINK;TORRENT_USE_OPENSSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -68,7 +68,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>.;.\libtorrent;..\..\third_party\openssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_WIN32_WINNT=0x0501;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;BOOST_ASIO_SEPARATE_COMPILATION;BOOST_ASIO_ENABLE_CANCELIO;TORRENT_USE_OPENSSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_WIN32_WINNT=0x0501;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;BOOST_ASIO_DYN_LINK;BOOST_ASIO_ENABLE_CANCELIO;TORRENT_USE_OPENSSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
@@ -82,8 +82,14 @@
   <ItemGroup>
     <ClCompile Include="..\src\alert.cpp" />
     <ClCompile Include="..\src\allocator.cpp" />
-    <ClCompile Include="..\src\asio.cpp" />
-    <ClCompile Include="..\src\asio_ssl.cpp" />
+    <ClCompile Include="..\src\asio.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\src\asio_ssl.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\src\assert.cpp" />
     <ClCompile Include="..\src\bandwidth_limit.cpp" />
     <ClCompile Include="..\src\bandwidth_manager.cpp" />