legacy branch: merge r3071-r3107 from trunk

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/branches/legacy@3108 10f7b99b-c216-0410-bff0-8a66a9350fd8

3 files changed, 17 insertions, 39 deletions

diff --git a/src/filters/transform/VSFilter/VSFilter.vcxproj b/src/filters/transform/VSFilter/VSFilter.vcxproj
index eed05fd7a..7da4e7b7a 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;_CRT_SECURE_NO_WARNINGS;%(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;_CRT_SECURE_NO_WARNINGS;%(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,9 @@ update_version.bat
     </Manifest>

   </ItemDefinitionGroup>

   <ItemGroup>

+    <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp" />

+    <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp" />

+    <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp" />

     <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..7a6617da2 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_afx2.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)