diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-07-27 04:12:44 +0400 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-07-27 04:12:44 +0400 |
commit | 2480ccc572946765dc4c92615d4ea2a8879c95c8 (patch) | |
tree | a81bf9fe12bb325e7a3c0956601e5d4828eee2ae /src/filters/transform/MPCVideoDec | |
parent | c1f422f8861cfb463b5c9333c1c20b7e36b70526 (diff) |
-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
Diffstat (limited to 'src/filters/transform/MPCVideoDec')
-rw-r--r-- | src/filters/transform/MPCVideoDec/MPCVideoDec.vcproj | 4 | ||||
-rw-r--r-- | src/filters/transform/MPCVideoDec/MPCVideoDec.vcxproj | 16 | ||||
-rw-r--r-- | src/filters/transform/MPCVideoDec/intrin_fixed.h | 8 |
3 files changed, 12 insertions, 16 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)
|