diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-06-12 14:58:48 +0400 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-06-12 14:58:48 +0400 |
commit | 62bb6c9b03c33ad5b6cad769af61efd30eba162f (patch) | |
tree | e720ebb69cbd6a1e2255aca65c8ba1dd207a979f | |
parent | 5ea05fdcdc3cf4a8978ad0a7c1f564a1b39368ac (diff) |
* Don't compile vd_asm.cpp for x64 builds since it's used in Win32 only
* Don't compile MPCFfmpegDec.cpp for Debug/Release builds since it's used in Filters only
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@5099 10f7b99b-c216-0410-bff0-8a66a9350fd8
-rw-r--r-- | src/DSUtil/DSUtil.vcxproj | 4 | ||||
-rw-r--r-- | src/filters/transform/MPCVideoDec/MPCFfmpegDec.cpp | 5 | ||||
-rw-r--r-- | src/filters/transform/MPCVideoDec/MPCVideoDec.vcxproj | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/DSUtil/DSUtil.vcxproj b/src/DSUtil/DSUtil.vcxproj index 3803e3bc9..61489d588 100644 --- a/src/DSUtil/DSUtil.vcxproj +++ b/src/DSUtil/DSUtil.vcxproj @@ -129,7 +129,9 @@ <ClCompile Include="SysVersion.cpp" />
<ClCompile Include="text.cpp" />
<ClCompile Include="vd.cpp" />
- <ClCompile Include="vd_asm.cpp" />
+ <ClCompile Include="vd_asm.cpp">
+ <ExcludedFromBuild Condition="'$(Platform)'=='x64'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="WinAPIUtils.cpp" />
</ItemGroup>
<ItemGroup>
diff --git a/src/filters/transform/MPCVideoDec/MPCFfmpegDec.cpp b/src/filters/transform/MPCVideoDec/MPCFfmpegDec.cpp index dfc641efd..f2c3be1a3 100644 --- a/src/filters/transform/MPCVideoDec/MPCFfmpegDec.cpp +++ b/src/filters/transform/MPCVideoDec/MPCFfmpegDec.cpp @@ -24,22 +24,18 @@ #include "MPCVideoDecFilter.h"
#include "../../../DSUtil/DSUtil.h"
-
#ifdef REGISTER_FILTER
-
// Workaround: graphedit crashes when a filter exposes more than 115 input MediaTypes!
const AMOVIESETUP_PIN sudpPinsVideoDec[] = {
{L"Input", FALSE, FALSE, FALSE, FALSE, &CLSID_NULL, NULL, CMPCVideoDecFilter::sudPinTypesInCount > 115 ? 115 : CMPCVideoDecFilter::sudPinTypesInCount, CMPCVideoDecFilter::sudPinTypesIn},
{L"Output", FALSE, TRUE, FALSE, FALSE, &CLSID_NULL, NULL, CMPCVideoDecFilter::sudPinTypesOutCount, CMPCVideoDecFilter::sudPinTypesOut}
};
-
const AMOVIESETUP_FILTER sudFilters[] = {
{&__uuidof(CMPCVideoDecFilter), MPCVideoDecName, /*MERIT_DO_NOT_USE*/0x40000001, _countof(sudpPinsVideoDec), sudpPinsVideoDec, CLSID_LegacyAmFilterCategory}
};
-
CFactoryTemplate g_Templates[] = {
{sudFilters[0].strName, &__uuidof(CMPCVideoDecFilter), CreateInstance<CMPCVideoDecFilter>, NULL, &sudFilters[0]},
{L"CMPCVideoDecPropertyPage", &__uuidof(CMPCVideoDecSettingsWnd), CreateInstance<CInternalPropertyPageTempl<CMPCVideoDecSettingsWnd> >},
@@ -58,7 +54,6 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE);
}
-
#include "../../FilterApp.h"
CFilterApp theApp;
diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDec.vcxproj b/src/filters/transform/MPCVideoDec/MPCVideoDec.vcxproj index ec6652b6d..913dec80f 100644 --- a/src/filters/transform/MPCVideoDec/MPCVideoDec.vcxproj +++ b/src/filters/transform/MPCVideoDec/MPCVideoDec.vcxproj @@ -244,7 +244,9 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="H264RandomAccess.cpp" />
- <ClCompile Include="MPCFfmpegDec.cpp" />
+ <ClCompile Include="MPCFfmpegDec.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug' or '$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="MPCVideoDecFilter.cpp" />
<ClCompile Include="MPCVideoDecSettingsWnd.cpp" />
<ClCompile Include="stdafx.cpp">
|