-updated project files fixing some warnings for msvc2010 builds

-fixed vsfilter msvs2010 solution file
-added msvc2010 projects for MPCTestAPI
-updated svn ignore list

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

5 files changed, 16 insertions, 20 deletions

diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDec.vcproj b/src/filters/transform/MPCVideoDec/MPCVideoDec.vcproj
index f6b53253d..1a57edd70 100644
--- a/src/filters/transform/MPCVideoDec/MPCVideoDec.vcproj
+++ b/src/filters/transform/MPCVideoDec/MPCVideoDec.vcproj
@@ -348,7 +348,6 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				LinkLibraryDependencies="true"

 				AdditionalDependencies="libavcodec.lib"

 				AdditionalLibraryDirectories="$(OutDir)"

 			/>

@@ -409,7 +408,6 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				LinkLibraryDependencies="true"

 				AdditionalDependencies="libavcodec.lib"

 				AdditionalLibraryDirectories="$(OutDir)"

 			/>

@@ -469,7 +467,6 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				LinkLibraryDependencies="true"

 				AdditionalOptions="/IGNORE:4221"

 				AdditionalDependencies="libavcodec.lib libgcc.a libmingwex.a"

 				AdditionalLibraryDirectories="$(OutDir);$(SolutionDir)lib"

@@ -532,7 +529,6 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				LinkLibraryDependencies="true"

 				AdditionalOptions="/IGNORE:4221"

 				AdditionalDependencies="libavcodec.lib libgcc.a libmingwex.a"

 				AdditionalLibraryDirectories="$(OutDir);$(SolutionDir)lib64"

diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDec.vcxproj b/src/filters/transform/MPCVideoDec/MPCVideoDec.vcxproj
index 2a6596bf9..dd931e545 100644
--- a/src/filters/transform/MPCVideoDec/MPCVideoDec.vcxproj
+++ b/src/filters/transform/MPCVideoDec/MPCVideoDec.vcxproj
@@ -233,9 +233,7 @@
       <AdditionalIncludeDirectories>..\..\..\..\include;ffmpeg;ffmpeg\libavcodec;ffmpeg\libavutil;..\..\BaseClasses;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

     </ClCompile>

-    <ProjectReference>

-      <LinkLibraryDependencies>true</LinkLibraryDependencies>

-    </ProjectReference>

+    <ProjectReference />

     <Lib>

       <AdditionalDependencies>libavcodec.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

@@ -251,9 +249,7 @@
       <PreprocessorDefinitions>_WIN64;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

     </ClCompile>

-    <ProjectReference>

-      <LinkLibraryDependencies>true</LinkLibraryDependencies>

-    </ProjectReference>

+    <ProjectReference />

     <Lib>

       <AdditionalDependencies>libavcodec.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

@@ -267,9 +263,7 @@
       <PrecompiledHeader>

       </PrecompiledHeader>

     </ClCompile>

-    <ProjectReference>

-      <LinkLibraryDependencies>true</LinkLibraryDependencies>

-    </ProjectReference>

+    <ProjectReference />

     <Lib>

       <AdditionalOptions>/IGNORE:4221 %(AdditionalOptions)</AdditionalOptions>

       <AdditionalDependencies>libavcodec.lib;libgcc.a;libmingwex.a;%(AdditionalDependencies)</AdditionalDependencies>

@@ -288,9 +282,7 @@
       <PrecompiledHeader>

       </PrecompiledHeader>

     </ClCompile>

-    <ProjectReference>

-      <LinkLibraryDependencies>true</LinkLibraryDependencies>

-    </ProjectReference>

+    <ProjectReference />

     <Lib>

       <AdditionalOptions>/IGNORE:4221 %(AdditionalOptions)</AdditionalOptions>

       <AdditionalDependencies>libavcodec.lib;libgcc.a;libmingwex.a;%(AdditionalDependencies)</AdditionalDependencies>

diff --git a/src/filters/transform/MPCVideoDec/intrin_fixed.h b/src/filters/transform/MPCVideoDec/intrin_fixed.h
index 45b8ec156..bdf74155f 100644
--- a/src/filters/transform/MPCVideoDec/intrin_fixed.h
+++ b/src/filters/transform/MPCVideoDec/intrin_fixed.h
@@ -64,20 +64,28 @@ extern "C" {
 **	__MACHINEZ	: nothing

 */

 

+#if (_MSC_VER < 1600)

 #define __MACHINEX64	__MACHINE

 #define __MACHINEARMX	__MACHINE

 #define __MACHINECC   __MACHINE

 #define __MACHINECE   __MACHINE

+#endif

 #define	__MACHINEI	__MACHINE

+#if (_MSC_VER < 1600)

 #define __MACHINEIA32 __MACHINE

+#endif

 #define	__MACHINEX86X	__MACHINE

 #define	__MACHINEX86X_NOX64	__MACHINE

 #define	__MACHINEX86X_NOIA64	__MACHINE

 #define	__MACHINEX86X_NOWIN64	__MACHINE

+#if (_MSC_VER < 1600)

 #define	__MACHINEIA64	__MACHINE

 #define __MACHINESA   __MACHINE

+#endif

 #define	__MACHINEIW64	__MACHINE

+#if (_MSC_VER < 1600)

 #define	__MACHINEW64	__MACHINE

+#endif

 #if defined(_M_CEE_PURE)

 /* No intrinsics available to pure managed code */

 #define	__MACHINE(X)	__MACHINEZ(X)

diff --git a/src/filters/transform/VSFilter/VSFilter.vcxproj b/src/filters/transform/VSFilter/VSFilter.vcxproj
index b3c621972..faa307e11 100644
--- a/src/filters/transform/VSFilter/VSFilter.vcxproj
+++ b/src/filters/transform/VSFilter/VSFilter.vcxproj
@@ -253,10 +253,6 @@ update_version.bat
       <Project>{e8a3f6fa-ae1c-4c8e-a0b6-9c8480324eaa}</Project>

       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

     </ProjectReference>

-    <ProjectReference Include="..\..\Filters.vcxproj">

-      <Project>{273b3149-3192-4b75-a791-470320b90812}</Project>

-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

-    </ProjectReference>

     <ProjectReference Include="..\BaseVideoFilter\BaseVideoFilter.vcxproj">

       <Project>{54dda60f-e528-4d07-a152-960a1e818680}</Project>

       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

diff --git a/src/filters/transform/VSFilter/VSFilter_2010.sln b/src/filters/transform/VSFilter/VSFilter_2010.sln
index 3f41dff92..c9b99901a 100644
--- a/src/filters/transform/VSFilter/VSFilter_2010.sln
+++ b/src/filters/transform/VSFilter/VSFilter_2010.sln
@@ -3,6 +3,10 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VD", "VD", "{2B9F1D31-0D4A-4DBA-BBCB-9DB281AB314F}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VSFilter", "VSFilter.vcxproj", "{F671100C-469F-4723-AAC4-B7FE4F5B8DC4}"

+	ProjectSection(ProjectDependencies) = postProject

+		{0D252872-7542-4232-8D02-53F9182AEE15} = {0D252872-7542-4232-8D02-53F9182AEE15}

+		{C2082189-3ECB-4079-91FA-89D3C8A305C0} = {C2082189-3ECB-4079-91FA-89D3C8A305C0}

+	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SubPic", "..\..\..\SubPic\SubPic.vcxproj", "{D514EA4D-EAFB-47A9-A437-A582CA571251}"

 EndProject