diff options
103 files changed, 882 insertions, 708 deletions
diff --git a/src/filters/Filters.vcxproj b/src/filters/Filters.vcxproj index 20ef919e8..e1157d06b 100644 --- a/src/filters/Filters.vcxproj +++ b/src/filters/Filters.vcxproj @@ -105,7 +105,6 @@ <ClCompile>
<AdditionalIncludeDirectories>BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
</ClCompile>
<Lib>
<TargetMachine>MachineX64</TargetMachine>
diff --git a/src/filters/muxer/DSMMuxer/DSMMuxer.vcxproj b/src/filters/muxer/DSMMuxer/DSMMuxer.vcxproj index ace44ad5a..bcad00bcc 100644 --- a/src/filters/muxer/DSMMuxer/DSMMuxer.vcxproj +++ b/src/filters/muxer/DSMMuxer/DSMMuxer.vcxproj @@ -220,7 +220,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>DSMMuxer.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ResourceCompile>
@@ -241,7 +240,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>DSMMuxer.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ResourceCompile>
@@ -249,6 +247,18 @@ </ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="DSMMuxer.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Filter|Win32'">Create</PrecompiledHeader>
diff --git a/src/filters/muxer/DSMMuxer/DSMMuxer.vcxproj.filters b/src/filters/muxer/DSMMuxer/DSMMuxer.vcxproj.filters index db6d2a69b..cb5b513a7 100644 --- a/src/filters/muxer/DSMMuxer/DSMMuxer.vcxproj.filters +++ b/src/filters/muxer/DSMMuxer/DSMMuxer.vcxproj.filters @@ -21,6 +21,15 @@ <ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="DSMMuxer.def">
diff --git a/src/filters/muxer/DSMMuxer/stdafx.h b/src/filters/muxer/DSMMuxer/stdafx.h index bc925c87a..62aa27f45 100644 --- a/src/filters/muxer/DSMMuxer/stdafx.h +++ b/src/filters/muxer/DSMMuxer/stdafx.h @@ -1,7 +1,4 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -19,25 +16,13 @@ *
*/
-
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
#include <atlbase.h>
#include <atlcoll.h>
#include <atlpath.h>
-
-#include <dshow.h>
-#include <streams.h>
-#include <dvdmedia.h>
-
diff --git a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.vcxproj b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.vcxproj index 81cf5599d..2ea0246c6 100644 --- a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.vcxproj +++ b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.vcxproj @@ -220,7 +220,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>MatroskaMuxer.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ResourceCompile>
@@ -241,7 +240,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>MatroskaMuxer.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ResourceCompile>
@@ -249,6 +247,18 @@ </ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="MatroskaFile.cpp" />
<ClCompile Include="MatroskaMuxer.cpp" />
<ClCompile Include="stdafx.cpp">
diff --git a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.vcxproj.filters b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.vcxproj.filters index d653d4775..5ac276fe6 100644 --- a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.vcxproj.filters +++ b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.vcxproj.filters @@ -24,6 +24,15 @@ <ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="MatroskaMuxer.def">
diff --git a/src/filters/muxer/MatroskaMuxer/stdafx.h b/src/filters/muxer/MatroskaMuxer/stdafx.h index a24b77625..41145a210 100644 --- a/src/filters/muxer/MatroskaMuxer/stdafx.h +++ b/src/filters/muxer/MatroskaMuxer/stdafx.h @@ -1,7 +1,4 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -19,21 +16,9 @@ *
*/
-
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-
-#include <dshow.h>
-#include <streams.h>
-#include <dvdmedia.h>
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
diff --git a/src/filters/muxer/WavDest/WavDest.vcxproj b/src/filters/muxer/WavDest/WavDest.vcxproj index 28d06c2a5..255104b48 100644 --- a/src/filters/muxer/WavDest/WavDest.vcxproj +++ b/src/filters/muxer/WavDest/WavDest.vcxproj @@ -214,7 +214,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>WavDest.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -232,11 +231,22 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>WavDest.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Filter|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Filter|x64'">Create</PrecompiledHeader>
diff --git a/src/filters/muxer/WavDest/WavDest.vcxproj.filters b/src/filters/muxer/WavDest/WavDest.vcxproj.filters index 6717c6254..835e73c72 100644 --- a/src/filters/muxer/WavDest/WavDest.vcxproj.filters +++ b/src/filters/muxer/WavDest/WavDest.vcxproj.filters @@ -17,6 +17,15 @@ <ClCompile Include="WavDest.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="WavDest.def">
diff --git a/src/filters/muxer/WavDest/stdafx.h b/src/filters/muxer/WavDest/stdafx.h index 811869bff..592d74bc5 100644 --- a/src/filters/muxer/WavDest/stdafx.h +++ b/src/filters/muxer/WavDest/stdafx.h @@ -1,7 +1,4 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -19,17 +16,8 @@ *
*/
-
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
diff --git a/src/filters/parser/AviSplitter/AviSplitter.vcxproj b/src/filters/parser/AviSplitter/AviSplitter.vcxproj index 7487efaaa..4b2a88383 100644 --- a/src/filters/parser/AviSplitter/AviSplitter.vcxproj +++ b/src/filters/parser/AviSplitter/AviSplitter.vcxproj @@ -222,7 +222,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>AviSplitter.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ResourceCompile>
@@ -245,7 +244,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>AviSplitter.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ResourceCompile>
@@ -253,6 +251,18 @@ </ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="AviFile.cpp" />
<ClCompile Include="AviReportWnd.cpp" />
<ClCompile Include="AviSplitter.cpp" />
diff --git a/src/filters/parser/AviSplitter/AviSplitter.vcxproj.filters b/src/filters/parser/AviSplitter/AviSplitter.vcxproj.filters index 4723c62cc..cf151abcf 100644 --- a/src/filters/parser/AviSplitter/AviSplitter.vcxproj.filters +++ b/src/filters/parser/AviSplitter/AviSplitter.vcxproj.filters @@ -27,6 +27,15 @@ <ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="AviSplitter.def">
diff --git a/src/filters/parser/AviSplitter/stdafx.h b/src/filters/parser/AviSplitter/stdafx.h index 37bcea3a7..41145a210 100644 --- a/src/filters/parser/AviSplitter/stdafx.h +++ b/src/filters/parser/AviSplitter/stdafx.h @@ -1,7 +1,4 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -20,19 +17,8 @@ */
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-
-#include <dshow.h>
-#include <streams.h>
-#include <dvdmedia.h>
-#include "../../../DSUtil/DSUtil.h"
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
diff --git a/src/filters/parser/BaseSplitter/stdafx.h b/src/filters/parser/BaseSplitter/stdafx.h index eb1a0a29e..41145a210 100644 --- a/src/filters/parser/BaseSplitter/stdafx.h +++ b/src/filters/parser/BaseSplitter/stdafx.h @@ -1,7 +1,4 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -20,18 +17,8 @@ */
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-
-#include <dshow.h>
-#include <streams.h>
-#include <dvdmedia.h>
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
diff --git a/src/filters/parser/DSMSplitter/DSMSplitter.vcxproj b/src/filters/parser/DSMSplitter/DSMSplitter.vcxproj index 6c9f32a6c..b3e74a3f0 100644 --- a/src/filters/parser/DSMSplitter/DSMSplitter.vcxproj +++ b/src/filters/parser/DSMSplitter/DSMSplitter.vcxproj @@ -222,7 +222,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>DSMSplitter.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ResourceCompile>
@@ -243,7 +242,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>DSMSplitter.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ResourceCompile>
@@ -251,6 +249,18 @@ </ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="DSMSplitter.cpp" />
<ClCompile Include="DSMSplitterFile.cpp" />
<ClCompile Include="stdafx.cpp">
diff --git a/src/filters/parser/DSMSplitter/DSMSplitter.vcxproj.filters b/src/filters/parser/DSMSplitter/DSMSplitter.vcxproj.filters index cabc05e43..7178783c8 100644 --- a/src/filters/parser/DSMSplitter/DSMSplitter.vcxproj.filters +++ b/src/filters/parser/DSMSplitter/DSMSplitter.vcxproj.filters @@ -24,6 +24,15 @@ <ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="DSMSplitter.def">
diff --git a/src/filters/parser/DSMSplitter/stdafx.h b/src/filters/parser/DSMSplitter/stdafx.h index 9b252ac14..75b000d77 100644 --- a/src/filters/parser/DSMSplitter/stdafx.h +++ b/src/filters/parser/DSMSplitter/stdafx.h @@ -1,7 +1,7 @@ /*
* Copyright (C) 2003-2006 Gabest
* http://www.gabest.org
- *
+/*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -20,19 +20,10 @@ */
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
#include <atlcoll.h>
-
-#include <dshow.h>
-#include <streams.h>
-#include <dvdmedia.h>
diff --git a/src/filters/parser/FLVSplitter/FLVSplitter.vcxproj b/src/filters/parser/FLVSplitter/FLVSplitter.vcxproj index 2670ec27e..f774fc110 100644 --- a/src/filters/parser/FLVSplitter/FLVSplitter.vcxproj +++ b/src/filters/parser/FLVSplitter/FLVSplitter.vcxproj @@ -222,7 +222,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>FLVSplitter.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ResourceCompile>
@@ -243,7 +242,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>FLVSplitter.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ResourceCompile>
@@ -251,6 +249,18 @@ </ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="FLVSplitter.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Filter|Win32'">Create</PrecompiledHeader>
diff --git a/src/filters/parser/FLVSplitter/FLVSplitter.vcxproj.filters b/src/filters/parser/FLVSplitter/FLVSplitter.vcxproj.filters index 064873ff6..2ff1792ed 100644 --- a/src/filters/parser/FLVSplitter/FLVSplitter.vcxproj.filters +++ b/src/filters/parser/FLVSplitter/FLVSplitter.vcxproj.filters @@ -21,6 +21,15 @@ <ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="FLVSplitter.def">
diff --git a/src/filters/parser/FLVSplitter/stdafx.h b/src/filters/parser/FLVSplitter/stdafx.h index 9b252ac14..41145a210 100644 --- a/src/filters/parser/FLVSplitter/stdafx.h +++ b/src/filters/parser/FLVSplitter/stdafx.h @@ -1,7 +1,4 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -20,19 +17,8 @@ */
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-#include <atlcoll.h>
-
-#include <dshow.h>
-#include <streams.h>
-#include <dvdmedia.h>
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
diff --git a/src/filters/parser/MP4Splitter/MP4Splitter.vcxproj b/src/filters/parser/MP4Splitter/MP4Splitter.vcxproj index 0fa76aaab..308e70e19 100644 --- a/src/filters/parser/MP4Splitter/MP4Splitter.vcxproj +++ b/src/filters/parser/MP4Splitter/MP4Splitter.vcxproj @@ -230,7 +230,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>MP4Splitter.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ResourceCompile>
@@ -252,7 +251,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>MP4Splitter.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ResourceCompile>
@@ -260,6 +258,18 @@ </ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="Ap4AsyncReaderStream.cpp" />
<ClCompile Include="AP4\Core\Ap4Atom.cpp" />
<ClCompile Include="AP4\Core\Ap4AtomFactory.cpp" />
diff --git a/src/filters/parser/MP4Splitter/MP4Splitter.vcxproj.filters b/src/filters/parser/MP4Splitter/MP4Splitter.vcxproj.filters index 11a34b5d9..7d4bf53c8 100644 --- a/src/filters/parser/MP4Splitter/MP4Splitter.vcxproj.filters +++ b/src/filters/parser/MP4Splitter/MP4Splitter.vcxproj.filters @@ -243,6 +243,15 @@ <ClCompile Include="AP4\Crypto\Ap4StreamCipher.cpp">
<Filter>AP4\Crypto</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="Ap4AsyncReaderStream.h">
diff --git a/src/filters/parser/MP4Splitter/stdafx.h b/src/filters/parser/MP4Splitter/stdafx.h index 9b252ac14..41145a210 100644 --- a/src/filters/parser/MP4Splitter/stdafx.h +++ b/src/filters/parser/MP4Splitter/stdafx.h @@ -1,7 +1,4 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -20,19 +17,8 @@ */
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-#include <atlcoll.h>
-
-#include <dshow.h>
-#include <streams.h>
-#include <dvdmedia.h>
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
diff --git a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.vcxproj b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.vcxproj index 285338019..9c2e7e2bc 100644 --- a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.vcxproj +++ b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.vcxproj @@ -220,7 +220,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>MatroskaSplitter.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ResourceCompile>
@@ -241,7 +240,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>MatroskaSplitter.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ResourceCompile>
@@ -249,6 +247,18 @@ </ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="MatroskaFile.cpp" />
<ClCompile Include="MatroskaSplitter.cpp" />
<ClCompile Include="stdafx.cpp">
diff --git a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.vcxproj.filters b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.vcxproj.filters index 776a3a888..b2101be9b 100644 --- a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.vcxproj.filters +++ b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.vcxproj.filters @@ -24,6 +24,15 @@ <ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="MatroskaSplitter.def">
diff --git a/src/filters/parser/MatroskaSplitter/stdafx.h b/src/filters/parser/MatroskaSplitter/stdafx.h index 37bcea3a7..8839eccc1 100644 --- a/src/filters/parser/MatroskaSplitter/stdafx.h +++ b/src/filters/parser/MatroskaSplitter/stdafx.h @@ -1,7 +1,4 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -20,19 +17,9 @@ */
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-
-#include <dshow.h>
-#include <streams.h>
-#include <dvdmedia.h>
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
#include "../../../DSUtil/DSUtil.h"
diff --git a/src/filters/parser/MpaSplitter/MpaSplitter.vcxproj b/src/filters/parser/MpaSplitter/MpaSplitter.vcxproj index 59521a867..f22d8dce3 100644 --- a/src/filters/parser/MpaSplitter/MpaSplitter.vcxproj +++ b/src/filters/parser/MpaSplitter/MpaSplitter.vcxproj @@ -220,7 +220,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>MpaSplitter.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ResourceCompile>
@@ -241,7 +240,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>MpaSplitter.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ResourceCompile>
@@ -249,6 +247,18 @@ </ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="MpaSplitter.cpp" />
<ClCompile Include="MpaSplitterFile.cpp" />
<ClCompile Include="stdafx.cpp">
diff --git a/src/filters/parser/MpaSplitter/MpaSplitter.vcxproj.filters b/src/filters/parser/MpaSplitter/MpaSplitter.vcxproj.filters index a0433ea57..9412a34ff 100644 --- a/src/filters/parser/MpaSplitter/MpaSplitter.vcxproj.filters +++ b/src/filters/parser/MpaSplitter/MpaSplitter.vcxproj.filters @@ -24,6 +24,15 @@ <ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="MpaSplitter.def">
diff --git a/src/filters/parser/MpaSplitter/stdafx.h b/src/filters/parser/MpaSplitter/stdafx.h index 114712db9..25ac576a9 100644 --- a/src/filters/parser/MpaSplitter/stdafx.h +++ b/src/filters/parser/MpaSplitter/stdafx.h @@ -2,6 +2,7 @@ * Copyright (C) 2003-2006 Gabest
* http://www.gabest.org
*
+/*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -20,21 +21,11 @@ */
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-
-#include <dshow.h>
-#include <streams.h>
-#include <dvdmedia.h>
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
#include <atlbase.h>
#include <atlcoll.h>
diff --git a/src/filters/parser/MpegSplitter/MpegSplitter.vcxproj b/src/filters/parser/MpegSplitter/MpegSplitter.vcxproj index 4a7a783a3..ccc1c4b7c 100644 --- a/src/filters/parser/MpegSplitter/MpegSplitter.vcxproj +++ b/src/filters/parser/MpegSplitter/MpegSplitter.vcxproj @@ -220,7 +220,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>MpegSplitter.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ResourceCompile>
@@ -241,7 +240,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>MpegSplitter.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ResourceCompile>
@@ -249,6 +247,18 @@ </ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="MpegSplitter.cpp" />
<ClCompile Include="MpegSplitterFile.cpp" />
<ClCompile Include="MpegSplitterSettingsWnd.cpp" />
diff --git a/src/filters/parser/MpegSplitter/MpegSplitter.vcxproj.filters b/src/filters/parser/MpegSplitter/MpegSplitter.vcxproj.filters index 89492dcbf..4412d2052 100644 --- a/src/filters/parser/MpegSplitter/MpegSplitter.vcxproj.filters +++ b/src/filters/parser/MpegSplitter/MpegSplitter.vcxproj.filters @@ -27,6 +27,15 @@ <ClCompile Include="MpegSplitterSettingsWnd.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="MpegSplitter.def">
diff --git a/src/filters/parser/MpegSplitter/stdafx.h b/src/filters/parser/MpegSplitter/stdafx.h index 5560c6425..e2e2751e9 100644 --- a/src/filters/parser/MpegSplitter/stdafx.h +++ b/src/filters/parser/MpegSplitter/stdafx.h @@ -1,7 +1,4 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -20,27 +17,10 @@ */
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-
-#include <dshow.h>
-#include <streams.h>
-#include <dvdmedia.h>
-
-#include <atlbase.h>
-#include <atlcoll.h>
-#include "../../../DSUtil/DSUtil.h"
-#include "../../../DSUtil/MediaTypes.h"
-#include "../../../DSUtil/vd.h"
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
-#define EVO_SUPPORT 0
\ No newline at end of file +#define EVO_SUPPORT 0
diff --git a/src/filters/parser/OggSplitter/OggSplitter.vcxproj b/src/filters/parser/OggSplitter/OggSplitter.vcxproj index 36d0d1355..87f7c1dbf 100644 --- a/src/filters/parser/OggSplitter/OggSplitter.vcxproj +++ b/src/filters/parser/OggSplitter/OggSplitter.vcxproj @@ -220,7 +220,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>OggSplitter.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ResourceCompile>
@@ -241,7 +240,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>OggSplitter.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ResourceCompile>
@@ -249,6 +247,18 @@ </ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="OggFile.cpp" />
<ClCompile Include="OggSplitter.cpp" />
<ClCompile Include="stdafx.cpp" />
diff --git a/src/filters/parser/OggSplitter/OggSplitter.vcxproj.filters b/src/filters/parser/OggSplitter/OggSplitter.vcxproj.filters index 75c544937..139270130 100644 --- a/src/filters/parser/OggSplitter/OggSplitter.vcxproj.filters +++ b/src/filters/parser/OggSplitter/OggSplitter.vcxproj.filters @@ -24,6 +24,15 @@ <ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="OggSplitter.def">
diff --git a/src/filters/parser/OggSplitter/stdafx.h b/src/filters/parser/OggSplitter/stdafx.h index f8e9cd301..41145a210 100644 --- a/src/filters/parser/OggSplitter/stdafx.h +++ b/src/filters/parser/OggSplitter/stdafx.h @@ -1,7 +1,4 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -20,18 +17,8 @@ */
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-
-#include <streams.h>
-#include <dvdmedia.h>
-#include "../../../DSUtil/DSUtil.h"
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
diff --git a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.vcxproj b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.vcxproj index 8ad95d2a6..8b57ca45b 100644 --- a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.vcxproj +++ b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.vcxproj @@ -232,7 +232,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>RealMediaSplitter.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ResourceCompile>
@@ -253,7 +252,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>RealMediaSplitter.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ResourceCompile>
@@ -261,6 +259,18 @@ </ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="RealMediaSplitter.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Filter|Win32'">Create</PrecompiledHeader>
diff --git a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.vcxproj.filters b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.vcxproj.filters index 6399d4aff..b84783d40 100644 --- a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.vcxproj.filters +++ b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.vcxproj.filters @@ -21,6 +21,15 @@ <ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="RealMediaSplitter.def">
diff --git a/src/filters/parser/RealMediaSplitter/stdafx.h b/src/filters/parser/RealMediaSplitter/stdafx.h index eb1a0a29e..41145a210 100644 --- a/src/filters/parser/RealMediaSplitter/stdafx.h +++ b/src/filters/parser/RealMediaSplitter/stdafx.h @@ -1,7 +1,4 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -20,18 +17,8 @@ */
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-
-#include <dshow.h>
-#include <streams.h>
-#include <dvdmedia.h>
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
diff --git a/src/filters/parser/SSFSplitter/SSFSplitter.vcxproj b/src/filters/parser/SSFSplitter/SSFSplitter.vcxproj index 89526f1cf..4c7c17a8f 100644 --- a/src/filters/parser/SSFSplitter/SSFSplitter.vcxproj +++ b/src/filters/parser/SSFSplitter/SSFSplitter.vcxproj @@ -220,7 +220,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>SSFSplitter.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ResourceCompile>
@@ -241,7 +240,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>SSFSplitter.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ResourceCompile>
@@ -249,6 +247,18 @@ </ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="SSFSplitter.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Filter|Win32'">Create</PrecompiledHeader>
diff --git a/src/filters/parser/SSFSplitter/SSFSplitter.vcxproj.filters b/src/filters/parser/SSFSplitter/SSFSplitter.vcxproj.filters index a324b4656..08a287bff 100644 --- a/src/filters/parser/SSFSplitter/SSFSplitter.vcxproj.filters +++ b/src/filters/parser/SSFSplitter/SSFSplitter.vcxproj.filters @@ -21,6 +21,15 @@ <ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="SSFSplitter.def">
diff --git a/src/filters/parser/SSFSplitter/stdafx.h b/src/filters/parser/SSFSplitter/stdafx.h index 432a74d80..09a0f4b69 100644 --- a/src/filters/parser/SSFSplitter/stdafx.h +++ b/src/filters/parser/SSFSplitter/stdafx.h @@ -1,7 +1,4 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -20,23 +17,12 @@ */
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-
-#include <dshow.h>
-#include <streams.h>
-#include <dvdmedia.h>
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
#include <atlbase.h>
#include <atlcoll.h>
#include "../../../DSUtil/DSUtil.h"
-
diff --git a/src/filters/parser/StreamDriveThru/StreamDriveThru.vcxproj b/src/filters/parser/StreamDriveThru/StreamDriveThru.vcxproj index f30688cf3..682c2b062 100644 --- a/src/filters/parser/StreamDriveThru/StreamDriveThru.vcxproj +++ b/src/filters/parser/StreamDriveThru/StreamDriveThru.vcxproj @@ -222,7 +222,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>StreamDriveThru.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ResourceCompile>
@@ -243,7 +242,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>StreamDriveThru.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ResourceCompile>
@@ -251,6 +249,18 @@ </ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Filter|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Filter|x64'">Create</PrecompiledHeader>
diff --git a/src/filters/parser/StreamDriveThru/StreamDriveThru.vcxproj.filters b/src/filters/parser/StreamDriveThru/StreamDriveThru.vcxproj.filters index 1ac31bb0e..bf0dc2729 100644 --- a/src/filters/parser/StreamDriveThru/StreamDriveThru.vcxproj.filters +++ b/src/filters/parser/StreamDriveThru/StreamDriveThru.vcxproj.filters @@ -21,6 +21,15 @@ <ClCompile Include="StreamDriveThru.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="StreamDriveThru.def">
diff --git a/src/filters/parser/StreamDriveThru/stdafx.h b/src/filters/parser/StreamDriveThru/stdafx.h index a8c9e282b..41145a210 100644 --- a/src/filters/parser/StreamDriveThru/stdafx.h +++ b/src/filters/parser/StreamDriveThru/stdafx.h @@ -1,7 +1,4 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -20,17 +17,8 @@ */
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-
-#include <dshow.h>
-#include <streams.h>
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
diff --git a/src/filters/reader/CDDAReader/CDDAReader.vcxproj b/src/filters/reader/CDDAReader/CDDAReader.vcxproj index 9401b7ecd..cd9d11821 100644 --- a/src/filters/reader/CDDAReader/CDDAReader.vcxproj +++ b/src/filters/reader/CDDAReader/CDDAReader.vcxproj @@ -173,7 +173,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>CDDAReader.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ResourceCompile>
@@ -194,7 +193,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>CDDAReader.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ResourceCompile>
@@ -247,6 +245,18 @@ </Lib>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="CDDAReader.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Filter|Win32'">Create</PrecompiledHeader>
diff --git a/src/filters/reader/CDDAReader/CDDAReader.vcxproj.filters b/src/filters/reader/CDDAReader/CDDAReader.vcxproj.filters index 07df72a2c..83a1071b7 100644 --- a/src/filters/reader/CDDAReader/CDDAReader.vcxproj.filters +++ b/src/filters/reader/CDDAReader/CDDAReader.vcxproj.filters @@ -21,6 +21,15 @@ <ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="CDDAReader.def">
diff --git a/src/filters/reader/CDDAReader/stdafx.h b/src/filters/reader/CDDAReader/stdafx.h index d1c3768d8..41145a210 100644 --- a/src/filters/reader/CDDAReader/stdafx.h +++ b/src/filters/reader/CDDAReader/stdafx.h @@ -1,7 +1,4 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -20,17 +17,8 @@ */
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-
-#include <streams.h>
-#include <dvdmedia.h>
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
diff --git a/src/filters/reader/CDXAReader/CDXAReader.vcxproj b/src/filters/reader/CDXAReader/CDXAReader.vcxproj index f2900e655..ac669acf5 100644 --- a/src/filters/reader/CDXAReader/CDXAReader.vcxproj +++ b/src/filters/reader/CDXAReader/CDXAReader.vcxproj @@ -173,7 +173,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>CDXAReader.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ResourceCompile>
@@ -194,7 +193,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>CDXAReader.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ResourceCompile>
@@ -247,6 +245,18 @@ </Lib>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="CDXAReader.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Filter|Win32'">Create</PrecompiledHeader>
diff --git a/src/filters/reader/CDXAReader/CDXAReader.vcxproj.filters b/src/filters/reader/CDXAReader/CDXAReader.vcxproj.filters index 05dfa7455..41e9398ea 100644 --- a/src/filters/reader/CDXAReader/CDXAReader.vcxproj.filters +++ b/src/filters/reader/CDXAReader/CDXAReader.vcxproj.filters @@ -21,6 +21,15 @@ <ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="CDXAReader.def">
diff --git a/src/filters/reader/CDXAReader/stdafx.h b/src/filters/reader/CDXAReader/stdafx.h index d1c3768d8..41145a210 100644 --- a/src/filters/reader/CDXAReader/stdafx.h +++ b/src/filters/reader/CDXAReader/stdafx.h @@ -1,7 +1,4 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -20,17 +17,8 @@ */
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-
-#include <streams.h>
-#include <dvdmedia.h>
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
diff --git a/src/filters/reader/UDPReader/UDPReader.vcxproj b/src/filters/reader/UDPReader/UDPReader.vcxproj index d1f127339..da496c7ff 100644 --- a/src/filters/reader/UDPReader/UDPReader.vcxproj +++ b/src/filters/reader/UDPReader/UDPReader.vcxproj @@ -220,7 +220,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>UDPReader.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ResourceCompile>
@@ -241,7 +240,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>UDPReader.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ResourceCompile>
@@ -249,6 +247,18 @@ </ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Filter|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Filter|x64'">Create</PrecompiledHeader>
diff --git a/src/filters/reader/UDPReader/UDPReader.vcxproj.filters b/src/filters/reader/UDPReader/UDPReader.vcxproj.filters index 631c98c5f..a5b2b96fb 100644 --- a/src/filters/reader/UDPReader/UDPReader.vcxproj.filters +++ b/src/filters/reader/UDPReader/UDPReader.vcxproj.filters @@ -21,6 +21,15 @@ <ClCompile Include="UDPReader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="UDPReader.def">
diff --git a/src/filters/reader/UDPReader/stdafx.h b/src/filters/reader/UDPReader/stdafx.h index 934cd148d..a7870f691 100644 --- a/src/filters/reader/UDPReader/stdafx.h +++ b/src/filters/reader/UDPReader/stdafx.h @@ -1,7 +1,4 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -20,18 +17,11 @@ */
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
#include <afxsock.h>
#include <atlcoll.h>
-
-#include <streams.h>
diff --git a/src/filters/reader/VTSReader/VTSReader.vcxproj b/src/filters/reader/VTSReader/VTSReader.vcxproj index 8d2aefc13..2e1473784 100644 --- a/src/filters/reader/VTSReader/VTSReader.vcxproj +++ b/src/filters/reader/VTSReader/VTSReader.vcxproj @@ -220,7 +220,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>VTSReader.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ResourceCompile>
@@ -241,7 +240,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>VTSReader.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ResourceCompile>
@@ -249,6 +247,18 @@ </ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Filter|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Filter|x64'">Create</PrecompiledHeader>
diff --git a/src/filters/reader/VTSReader/VTSReader.vcxproj.filters b/src/filters/reader/VTSReader/VTSReader.vcxproj.filters index aa6f07b48..ce871e556 100644 --- a/src/filters/reader/VTSReader/VTSReader.vcxproj.filters +++ b/src/filters/reader/VTSReader/VTSReader.vcxproj.filters @@ -21,6 +21,15 @@ <ClCompile Include="VTSReader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="VTSReader.def">
diff --git a/src/filters/reader/VTSReader/stdafx.h b/src/filters/reader/VTSReader/stdafx.h index d8d4e35e7..41145a210 100644 --- a/src/filters/reader/VTSReader/stdafx.h +++ b/src/filters/reader/VTSReader/stdafx.h @@ -1,7 +1,4 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -20,16 +17,8 @@ */
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-
-#include <streams.h>
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
diff --git a/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererFilter.vcxproj b/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererFilter.vcxproj index 1d5ed0313..9ac130f70 100644 --- a/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererFilter.vcxproj +++ b/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererFilter.vcxproj @@ -174,7 +174,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>MpcAudioRenderer.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ResourceCompile>
@@ -195,7 +194,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>MpcAudioRenderer.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ResourceCompile>
@@ -256,6 +254,18 @@ </Lib>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="..\..\FilterApp.cpp" />
<ClCompile Include="MpcAudioRenderer.cpp" />
<ClCompile Include="MpcAudioRendererSettingsWnd.cpp" />
diff --git a/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererFilter.vcxproj.filters b/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererFilter.vcxproj.filters index 8a1a00c93..9610a5437 100644 --- a/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererFilter.vcxproj.filters +++ b/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererFilter.vcxproj.filters @@ -69,6 +69,15 @@ <ClCompile Include="MpcAudioRendererSettingsWnd.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="MpcAudioRenderer.def">
diff --git a/src/filters/renderer/MpcAudioRenderer/stdafx.h b/src/filters/renderer/MpcAudioRenderer/stdafx.h index 964d7222c..08cfba6de 100644 --- a/src/filters/renderer/MpcAudioRenderer/stdafx.h +++ b/src/filters/renderer/MpcAudioRenderer/stdafx.h @@ -1,38 +1,26 @@ /*
- * $Id$
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
*
- * (C) 2006-2010 see AUTHORS
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * This file is part of mplayerc.
- *
- * Mplayerc is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mplayerc is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
*
*/
-
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN
-#endif
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-#include <streams.h>
-#include <dvdmedia.h>
#include <dsound.h>
diff --git a/src/filters/source/D2VSource/D2VSource.vcxproj b/src/filters/source/D2VSource/D2VSource.vcxproj index a2d25325e..a0e07bdce 100644 --- a/src/filters/source/D2VSource/D2VSource.vcxproj +++ b/src/filters/source/D2VSource/D2VSource.vcxproj @@ -173,7 +173,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>D2VSource.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ResourceCompile>
@@ -194,7 +193,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>D2VSource.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ResourceCompile>
@@ -251,6 +249,18 @@ </Lib>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="D2VSource.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Filter|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
diff --git a/src/filters/source/D2VSource/D2VSource.vcxproj.filters b/src/filters/source/D2VSource/D2VSource.vcxproj.filters index f059b4781..2c9ea014f 100644 --- a/src/filters/source/D2VSource/D2VSource.vcxproj.filters +++ b/src/filters/source/D2VSource/D2VSource.vcxproj.filters @@ -30,6 +30,15 @@ <ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="D2VSource.def">
diff --git a/src/filters/source/D2VSource/stdafx.h b/src/filters/source/D2VSource/stdafx.h index ea1e96289..41145a210 100644 --- a/src/filters/source/D2VSource/stdafx.h +++ b/src/filters/source/D2VSource/stdafx.h @@ -1,15 +1,24 @@ -#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
+/*
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
+#pragma once
-#include <streams.h>
-#include <dvdmedia.h>
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
diff --git a/src/filters/source/DTSAC3Source/DTSAC3Source.vcxproj b/src/filters/source/DTSAC3Source/DTSAC3Source.vcxproj index dd15c1c8b..2c1c793d7 100644 --- a/src/filters/source/DTSAC3Source/DTSAC3Source.vcxproj +++ b/src/filters/source/DTSAC3Source/DTSAC3Source.vcxproj @@ -218,7 +218,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>DTSAC3Source.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ResourceCompile>
@@ -239,7 +238,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>DTSAC3Source.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ResourceCompile>
@@ -247,6 +245,18 @@ </ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="DTSAC3Source.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Filter|Win32'">Create</PrecompiledHeader>
diff --git a/src/filters/source/DTSAC3Source/DTSAC3Source.vcxproj.filters b/src/filters/source/DTSAC3Source/DTSAC3Source.vcxproj.filters index a495b93fe..219b20d08 100644 --- a/src/filters/source/DTSAC3Source/DTSAC3Source.vcxproj.filters +++ b/src/filters/source/DTSAC3Source/DTSAC3Source.vcxproj.filters @@ -21,6 +21,15 @@ <ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="DTSAC3Source.def">
diff --git a/src/filters/source/DTSAC3Source/stdafx.h b/src/filters/source/DTSAC3Source/stdafx.h index d1c3768d8..41145a210 100644 --- a/src/filters/source/DTSAC3Source/stdafx.h +++ b/src/filters/source/DTSAC3Source/stdafx.h @@ -1,7 +1,4 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -20,17 +17,8 @@ */
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-
-#include <streams.h>
-#include <dvdmedia.h>
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
diff --git a/src/filters/source/FLICSource/FLICSource.vcxproj b/src/filters/source/FLICSource/FLICSource.vcxproj index 83e2126df..2c24aa0d9 100644 --- a/src/filters/source/FLICSource/FLICSource.vcxproj +++ b/src/filters/source/FLICSource/FLICSource.vcxproj @@ -173,7 +173,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>FLICSource.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ResourceCompile>
@@ -194,7 +193,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>FLICSource.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ResourceCompile>
@@ -247,6 +245,18 @@ </Lib>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="FLICSource.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Filter|Win32'">Create</PrecompiledHeader>
diff --git a/src/filters/source/FLICSource/FLICSource.vcxproj.filters b/src/filters/source/FLICSource/FLICSource.vcxproj.filters index 9dba87b53..682e961d5 100644 --- a/src/filters/source/FLICSource/FLICSource.vcxproj.filters +++ b/src/filters/source/FLICSource/FLICSource.vcxproj.filters @@ -21,6 +21,15 @@ <ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="FLICSource.def">
diff --git a/src/filters/source/FLICSource/stdafx.h b/src/filters/source/FLICSource/stdafx.h index d1c3768d8..41145a210 100644 --- a/src/filters/source/FLICSource/stdafx.h +++ b/src/filters/source/FLICSource/stdafx.h @@ -1,7 +1,4 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -20,17 +17,8 @@ */
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-
-#include <streams.h>
-#include <dvdmedia.h>
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
diff --git a/src/filters/source/FlacSource/FlacSource.vcxproj b/src/filters/source/FlacSource/FlacSource.vcxproj index f9edcbafa..38d34c89d 100644 --- a/src/filters/source/FlacSource/FlacSource.vcxproj +++ b/src/filters/source/FlacSource/FlacSource.vcxproj @@ -227,7 +227,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>FlacSource.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ResourceCompile>
@@ -248,7 +247,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>FlacSource.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ResourceCompile>
@@ -256,6 +254,18 @@ </ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="FlacSource.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Filter|Win32'">Create</PrecompiledHeader>
diff --git a/src/filters/source/FlacSource/FlacSource.vcxproj.filters b/src/filters/source/FlacSource/FlacSource.vcxproj.filters index c33b77216..afe5ad0ef 100644 --- a/src/filters/source/FlacSource/FlacSource.vcxproj.filters +++ b/src/filters/source/FlacSource/FlacSource.vcxproj.filters @@ -21,6 +21,15 @@ <ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="FlacSource.def">
diff --git a/src/filters/source/FlacSource/stdafx.h b/src/filters/source/FlacSource/stdafx.h index d1c3768d8..41145a210 100644 --- a/src/filters/source/FlacSource/stdafx.h +++ b/src/filters/source/FlacSource/stdafx.h @@ -1,7 +1,4 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -20,17 +17,8 @@ */
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-
-#include <streams.h>
-#include <dvdmedia.h>
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
diff --git a/src/filters/source/ShoutcastSource/ShoutcastSource.vcxproj b/src/filters/source/ShoutcastSource/ShoutcastSource.vcxproj index c9e4a8a76..dc075160a 100644 --- a/src/filters/source/ShoutcastSource/ShoutcastSource.vcxproj +++ b/src/filters/source/ShoutcastSource/ShoutcastSource.vcxproj @@ -173,7 +173,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>ShoutcastSource.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ResourceCompile>
@@ -194,7 +193,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>ShoutcastSource.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ResourceCompile>
@@ -247,6 +245,18 @@ </Lib>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="ShoutcastSource.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Filter|Win32'">Create</PrecompiledHeader>
diff --git a/src/filters/source/ShoutcastSource/ShoutcastSource.vcxproj.filters b/src/filters/source/ShoutcastSource/ShoutcastSource.vcxproj.filters index 40b70e35d..4ca17e93a 100644 --- a/src/filters/source/ShoutcastSource/ShoutcastSource.vcxproj.filters +++ b/src/filters/source/ShoutcastSource/ShoutcastSource.vcxproj.filters @@ -21,6 +21,15 @@ <ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="ShoutcastSource.def">
diff --git a/src/filters/source/ShoutcastSource/stdafx.h b/src/filters/source/ShoutcastSource/stdafx.h index d1c3768d8..41145a210 100644 --- a/src/filters/source/ShoutcastSource/stdafx.h +++ b/src/filters/source/ShoutcastSource/stdafx.h @@ -1,7 +1,4 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -20,17 +17,8 @@ */
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-
-#include <streams.h>
-#include <dvdmedia.h>
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
diff --git a/src/filters/source/SubtitleSource/SubtitleSource.vcxproj b/src/filters/source/SubtitleSource/SubtitleSource.vcxproj index f36c38aef..7eb565bb2 100644 --- a/src/filters/source/SubtitleSource/SubtitleSource.vcxproj +++ b/src/filters/source/SubtitleSource/SubtitleSource.vcxproj @@ -173,7 +173,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>SubtitleSource.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ResourceCompile>
@@ -194,7 +193,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>SubtitleSource.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ResourceCompile>
@@ -249,6 +247,18 @@ </Lib>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Filter|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Filter|x64'">Create</PrecompiledHeader>
diff --git a/src/filters/source/SubtitleSource/SubtitleSource.vcxproj.filters b/src/filters/source/SubtitleSource/SubtitleSource.vcxproj.filters index 5cd8db6ef..ae66f7c8e 100644 --- a/src/filters/source/SubtitleSource/SubtitleSource.vcxproj.filters +++ b/src/filters/source/SubtitleSource/SubtitleSource.vcxproj.filters @@ -21,6 +21,15 @@ <ClCompile Include="SubtitleSource.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="SubtitleSource.def">
diff --git a/src/filters/source/SubtitleSource/stdafx.h b/src/filters/source/SubtitleSource/stdafx.h index d1c3768d8..41145a210 100644 --- a/src/filters/source/SubtitleSource/stdafx.h +++ b/src/filters/source/SubtitleSource/stdafx.h @@ -1,7 +1,4 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -20,17 +17,8 @@ */
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-
-#include <streams.h>
-#include <dvdmedia.h>
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
diff --git a/src/filters/stdafx.h b/src/filters/stdafx.h index a6b2179fe..b4623000c 100644 --- a/src/filters/stdafx.h +++ b/src/filters/stdafx.h @@ -22,18 +22,8 @@ */
#pragma once
-#include "../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-
-#include <dshow.h>
-#include <streams.h>
-#include <dvdmedia.h>
+#include "../DSUtil/SharedInclude.h"
+#include "../../../include/stdafx_common.h"
+#include "../../../include/stdafx_common_afx.h"
+#include "../../../include/stdafx_common_dshow.h"
diff --git a/src/filters/switcher/AudioSwitcher/AudioSwitcher.vcxproj b/src/filters/switcher/AudioSwitcher/AudioSwitcher.vcxproj index ef327a3cf..5cea04628 100644 --- a/src/filters/switcher/AudioSwitcher/AudioSwitcher.vcxproj +++ b/src/filters/switcher/AudioSwitcher/AudioSwitcher.vcxproj @@ -170,7 +170,6 @@ <AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>AudioSwitcher.def</ModuleDefinitionFile>
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -189,7 +188,6 @@ <AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>AudioSwitcher.def</ModuleDefinitionFile>
<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -241,6 +239,18 @@ </Lib>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="Audio.cpp" />
<ClCompile Include="AudioSwitcher.cpp" />
<ClCompile Include="stdafx.cpp">
diff --git a/src/filters/switcher/AudioSwitcher/AudioSwitcher.vcxproj.filters b/src/filters/switcher/AudioSwitcher/AudioSwitcher.vcxproj.filters index e1f89e55d..9b5bc798c 100644 --- a/src/filters/switcher/AudioSwitcher/AudioSwitcher.vcxproj.filters +++ b/src/filters/switcher/AudioSwitcher/AudioSwitcher.vcxproj.filters @@ -23,6 +23,15 @@ <ClCompile Include="StreamSwitcher.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="AudioSwitcher.def">
diff --git a/src/filters/switcher/AudioSwitcher/stdafx.h b/src/filters/switcher/AudioSwitcher/stdafx.h index d1c3768d8..41145a210 100644 --- a/src/filters/switcher/AudioSwitcher/stdafx.h +++ b/src/filters/switcher/AudioSwitcher/stdafx.h @@ -1,7 +1,4 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -20,17 +17,8 @@ */
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-
-#include <streams.h>
-#include <dvdmedia.h>
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
diff --git a/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.vcxproj b/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.vcxproj index fadd20108..f5e09a33e 100644 --- a/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.vcxproj +++ b/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.vcxproj @@ -173,7 +173,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>AVI2AC3Filter.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ResourceCompile>
@@ -194,7 +193,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>AVI2AC3Filter.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ResourceCompile>
@@ -247,6 +245,18 @@ </Lib>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="AVI2AC3Filter.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Filter|Win32'">Create</PrecompiledHeader>
diff --git a/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.vcxproj.filters b/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.vcxproj.filters index ca353514b..4bf920164 100644 --- a/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.vcxproj.filters +++ b/src/filters/transform/AVI2AC3Filter/AVI2AC3Filter.vcxproj.filters @@ -21,6 +21,15 @@ <ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="AVI2AC3Filter.def">
diff --git a/src/filters/transform/AVI2AC3Filter/stdafx.h b/src/filters/transform/AVI2AC3Filter/stdafx.h index d1c3768d8..41145a210 100644 --- a/src/filters/transform/AVI2AC3Filter/stdafx.h +++ b/src/filters/transform/AVI2AC3Filter/stdafx.h @@ -1,7 +1,4 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -20,17 +17,8 @@ */
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-
-#include <streams.h>
-#include <dvdmedia.h>
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
diff --git a/src/filters/transform/BaseVideoFilter/stdafx.h b/src/filters/transform/BaseVideoFilter/stdafx.h index 79bb9cc0d..41145a210 100644 --- a/src/filters/transform/BaseVideoFilter/stdafx.h +++ b/src/filters/transform/BaseVideoFilter/stdafx.h @@ -1,7 +1,4 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -20,18 +17,8 @@ */
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-
-#include <streams.h>
-#include <dvdmedia.h>
-#include <amvideo.h>
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
diff --git a/src/filters/transform/BufferFilter/BufferFilter.vcxproj b/src/filters/transform/BufferFilter/BufferFilter.vcxproj index 720a8a17e..a26d12030 100644 --- a/src/filters/transform/BufferFilter/BufferFilter.vcxproj +++ b/src/filters/transform/BufferFilter/BufferFilter.vcxproj @@ -167,7 +167,6 @@ <OutputFile>$(OutDir)$(ProjectName).ax</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>BufferFilter.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -185,7 +184,6 @@ <OutputFile>$(OutDir)$(ProjectName).ax</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>BufferFilter.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -235,6 +233,18 @@ </Lib>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="BufferFilter.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Filter|Win32'">Create</PrecompiledHeader>
diff --git a/src/filters/transform/BufferFilter/BufferFilter.vcxproj.filters b/src/filters/transform/BufferFilter/BufferFilter.vcxproj.filters index afadbd9f5..42cf11ff9 100644 --- a/src/filters/transform/BufferFilter/BufferFilter.vcxproj.filters +++ b/src/filters/transform/BufferFilter/BufferFilter.vcxproj.filters @@ -17,6 +17,15 @@ <ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="BufferFilter.def">
diff --git a/src/filters/transform/BufferFilter/stdafx.h b/src/filters/transform/BufferFilter/stdafx.h index d1c3768d8..41145a210 100644 --- a/src/filters/transform/BufferFilter/stdafx.h +++ b/src/filters/transform/BufferFilter/stdafx.h @@ -1,7 +1,4 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -20,17 +17,8 @@ */
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-
-#include <streams.h>
-#include <dvdmedia.h>
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
diff --git a/src/filters/transform/DeCSSFilter/DeCSSFilter.vcxproj b/src/filters/transform/DeCSSFilter/DeCSSFilter.vcxproj index 2ad3f023c..650db0be6 100644 --- a/src/filters/transform/DeCSSFilter/DeCSSFilter.vcxproj +++ b/src/filters/transform/DeCSSFilter/DeCSSFilter.vcxproj @@ -167,7 +167,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>DeCSSFilter.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -185,7 +184,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>DeCSSFilter.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -235,6 +233,18 @@ </Lib>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="DeCSSFilter.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Filter|Win32'">Create</PrecompiledHeader>
diff --git a/src/filters/transform/DeCSSFilter/DeCSSFilter.vcxproj.filters b/src/filters/transform/DeCSSFilter/DeCSSFilter.vcxproj.filters index c74cc5eda..176cf094e 100644 --- a/src/filters/transform/DeCSSFilter/DeCSSFilter.vcxproj.filters +++ b/src/filters/transform/DeCSSFilter/DeCSSFilter.vcxproj.filters @@ -17,6 +17,15 @@ <ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="DeCSSFilter.def">
diff --git a/src/filters/transform/DeCSSFilter/stdafx.h b/src/filters/transform/DeCSSFilter/stdafx.h index d1c3768d8..41145a210 100644 --- a/src/filters/transform/DeCSSFilter/stdafx.h +++ b/src/filters/transform/DeCSSFilter/stdafx.h @@ -1,7 +1,4 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -20,17 +17,8 @@ */
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-
-#include <streams.h>
-#include <dvdmedia.h>
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDec.vcxproj b/src/filters/transform/MPCVideoDec/MPCVideoDec.vcxproj index 84490b863..21cd10600 100644 --- a/src/filters/transform/MPCVideoDec/MPCVideoDec.vcxproj +++ b/src/filters/transform/MPCVideoDec/MPCVideoDec.vcxproj @@ -173,7 +173,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)lib;$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>MPCVideoDec.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ResourceCompile>
@@ -195,7 +194,6 @@ <AdditionalLibraryDirectories>$(SolutionDir)lib64;$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ModuleDefinitionFile>MPCVideoDec.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ResourceCompile>
@@ -265,6 +263,18 @@ </Lib>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="CpuId.cpp" />
<ClCompile Include="DXVADecoder.cpp" />
<ClCompile Include="DXVADecoderH264.cpp" />
diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDec.vcxproj.filters b/src/filters/transform/MPCVideoDec/MPCVideoDec.vcxproj.filters index aee6128c9..a1cd6862c 100644 --- a/src/filters/transform/MPCVideoDec/MPCVideoDec.vcxproj.filters +++ b/src/filters/transform/MPCVideoDec/MPCVideoDec.vcxproj.filters @@ -57,6 +57,15 @@ <ClCompile Include="VideoDecOutputPin.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="CpuId.h">
diff --git a/src/filters/transform/MPCVideoDec/stdafx.h b/src/filters/transform/MPCVideoDec/stdafx.h index 20ab527b4..0a3b2cbe9 100644 --- a/src/filters/transform/MPCVideoDec/stdafx.h +++ b/src/filters/transform/MPCVideoDec/stdafx.h @@ -1,42 +1,28 @@ /*
- * $Id$
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
*
- * (C) 2006-2010 see AUTHORS
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * This file is part of mplayerc.
- *
- * Mplayerc is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mplayerc is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
*
*/
-
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
-#include <streams.h>
-#include <dvdmedia.h>
#include <d3dx9.h>
#include <evr.h>
#include <mfapi.h>
@@ -44,7 +30,6 @@ #include <atlcoll.h>
#include <vector>
-
#ifdef _DEBUG
void LOG(LPCTSTR fmt, ...);
#else
diff --git a/src/filters/transform/MpaDecFilter/MpaDecFilter.vcxproj b/src/filters/transform/MpaDecFilter/MpaDecFilter.vcxproj index 6c526b2ec..bae19077b 100644 --- a/src/filters/transform/MpaDecFilter/MpaDecFilter.vcxproj +++ b/src/filters/transform/MpaDecFilter/MpaDecFilter.vcxproj @@ -173,7 +173,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)lib;$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>MpaDecFilter.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ResourceCompile>
@@ -194,7 +193,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)lib64;$(SolutionDir)bin10\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>MpaDecFilter.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ResourceCompile>
@@ -255,6 +253,18 @@ </Lib>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="MpaDecFilter.cpp" />
<ClCompile Include="MpaDecSettingsWnd.cpp" />
<ClCompile Include="stdafx.cpp">
diff --git a/src/filters/transform/MpaDecFilter/MpaDecFilter.vcxproj.filters b/src/filters/transform/MpaDecFilter/MpaDecFilter.vcxproj.filters index 46d343c11..f86443e33 100644 --- a/src/filters/transform/MpaDecFilter/MpaDecFilter.vcxproj.filters +++ b/src/filters/transform/MpaDecFilter/MpaDecFilter.vcxproj.filters @@ -24,6 +24,15 @@ <ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="IMpaDecFilter.h">
diff --git a/src/filters/transform/MpaDecFilter/stdafx.h b/src/filters/transform/MpaDecFilter/stdafx.h index 47fd64b3c..41145a210 100644 --- a/src/filters/transform/MpaDecFilter/stdafx.h +++ b/src/filters/transform/MpaDecFilter/stdafx.h @@ -1,9 +1,4 @@ /*
- * $Id$
- *
- * (C) 2003-2006 Gabest
- * (C) 2006-2010 see AUTHORS
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -22,17 +17,8 @@ */
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-
-#include <streams.h>
-#include <dvdmedia.h>
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
diff --git a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.vcxproj b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.vcxproj index 21087fc82..0f77d40a7 100644 --- a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.vcxproj +++ b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.vcxproj @@ -166,7 +166,6 @@ <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);$(SolutionDir)lib\detours;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>Mpeg2DecFilter.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ResourceCompile>
@@ -181,7 +180,6 @@ <Link>
<OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)bin10\lib\Release_$(Platform);$(SolutionDir)lib64\detours;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_UNICODE;UNICODE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -244,6 +242,18 @@ </Lib>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="idct_sse2.cpp">
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Release Filter|Win32'">AssemblyAndSourceCode</AssemblerOutput>
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Release Filter|x64'">AssemblyAndSourceCode</AssemblerOutput>
diff --git a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.vcxproj.filters b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.vcxproj.filters index 6ce3920f6..23f75ce15 100644 --- a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.vcxproj.filters +++ b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.vcxproj.filters @@ -33,6 +33,15 @@ <ClCompile Include="stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="attributes.h">
diff --git a/src/filters/transform/Mpeg2DecFilter/stdafx.h b/src/filters/transform/Mpeg2DecFilter/stdafx.h index 2e566de2c..41145a210 100644 --- a/src/filters/transform/Mpeg2DecFilter/stdafx.h +++ b/src/filters/transform/Mpeg2DecFilter/stdafx.h @@ -1,7 +1,4 @@ /*
- * Copyright (C) 2003-2006 Gabest
- * http://www.gabest.org
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -20,17 +17,8 @@ */
#pragma once
-#include "../../../DSUtil/SharedInclude.h"
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-#include <afx.h>
-#include <afxwin.h> // MFC core and standard components
-
-#include <streams.h>
-#include <dvdmedia.h>
-#include <amvideo.h>
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
diff --git a/src/filters/transform/VSFilter/VSFilter.vcxproj b/src/filters/transform/VSFilter/VSFilter.vcxproj index eed05fd7a..eabd36b52 100644 --- a/src/filters/transform/VSFilter/VSFilter.vcxproj +++ b/src/filters/transform/VSFilter/VSFilter.vcxproj @@ -136,7 +136,7 @@ update_version.bat </Midl>
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\include\virtualdub;..\..\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;ISOLATION_AWARE_ENABLED;_WIN32_WINNT=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;ISOLATION_AWARE_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_AFXDLL;NDEBUG;AFX_RESOURCE_DLL;AFX_TARG_ENU;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -149,7 +149,6 @@ update_version.bat <IgnoreSpecificDefaultLibraries>msvcrt;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ModuleDefinitionFile>VSFilter.def</ModuleDefinitionFile>
<DelayLoadDLLs>oleacc.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<Manifest>
@@ -167,7 +166,7 @@ update_version.bat </Midl>
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\include\virtualdub;..\..\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;NDEBUG;_USRDLL;ISOLATION_AWARE_ENABLED;_WIN32_WINNT=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_USRDLL;ISOLATION_AWARE_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
@@ -181,7 +180,6 @@ update_version.bat <IgnoreSpecificDefaultLibraries>msvcrt;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ModuleDefinitionFile>VSFilter.def</ModuleDefinitionFile>
<DelayLoadDLLs>oleacc.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
- <GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<Manifest>
@@ -189,6 +187,18 @@ update_version.bat </Manifest>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="AvgLines.cpp" />
<ClCompile Include="Copy.cpp" />
<ClCompile Include="csriapi.cpp" />
diff --git a/src/filters/transform/VSFilter/VSFilter.vcxproj.filters b/src/filters/transform/VSFilter/VSFilter.vcxproj.filters index 4d020c014..22a5e63bd 100644 --- a/src/filters/transform/VSFilter/VSFilter.vcxproj.filters +++ b/src/filters/transform/VSFilter/VSFilter.vcxproj.filters @@ -57,6 +57,15 @@ <ClCompile Include="VSFilter.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="VSFilter.def">
diff --git a/src/filters/transform/VSFilter/stdafx.h b/src/filters/transform/VSFilter/stdafx.h index ca6dba445..17c3b6935 100644 --- a/src/filters/transform/VSFilter/stdafx.h +++ b/src/filters/transform/VSFilter/stdafx.h @@ -1,9 +1,4 @@ /*
- * $Id$
- *
- * (C) 2003-2006 Gabest
- * (C) 2006-2010 see AUTHORS
- *
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -21,39 +16,12 @@ *
*/
-
-#if !defined(AFX_STDAFX_H__E8AD1C3F_323D_4812_A1DE_AA2419CE2AF3__INCLUDED_)
-#define AFX_STDAFX_H__E8AD1C3F_323D_4812_A1DE_AA2419CE2AF3__INCLUDED_
-
#pragma once
-#define STRICT
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0400
-#endif
#define _ATL_APARTMENT_THREADED
-#undef WINVER
-#define WINVER 0x0501
-
#include "../../../DSUtil/SharedInclude.h"
-
-#include <afxwin.h>
-#include <afxdisp.h>
-
-#include <atlbase.h>
-//You may derive a class from CComModule and use it if you want to override
-//something, but do not change the name of _Module
-extern CComModule _Module;
-#include <atlcom.h>
-
-#define AFX_CLASS AFX_CLASS_IMPORT
-
-#include <streams.h>
-#include <dvdmedia.h>
+#include "../../../../include/stdafx_common.h"
+#include "../../../../include/stdafx_common_afx.h"
+#include "../../../../include/stdafx_common_dshow.h"
#include "../../../DSUtil/DSUtil.h"
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_STDAFX_H__E8AD1C3F_323D_4812_A1DE_AA2419CE2AF3__INCLUDED)
|