diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2011-08-09 22:43:42 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2011-08-09 22:43:42 +0400 |
| commit | 34315757fc06d3200580649a7d97da6417046063 (patch) | |
| tree | aef9820d77c69b6f5ec2d60f31302ff9dbf821f0 /src/filters/parser/MP4Splitter | |
| parent | 3fdb38a13726e6890e84225900e1c3915bbac953 (diff) | |
* simplify ExcludedFromBuild Condition
* set "resource.h" as ClInclude in all projects and exclude it where it's not needed
* fix a C4305 warning introduced in r3620
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@3624 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/parser/MP4Splitter')
| -rw-r--r-- | src/filters/parser/MP4Splitter/MP4Splitter.vcxproj | 23 | ||||
| -rw-r--r-- | src/filters/parser/MP4Splitter/MP4Splitter.vcxproj.filters | 8 |
2 files changed, 10 insertions, 21 deletions
diff --git a/src/filters/parser/MP4Splitter/MP4Splitter.vcxproj b/src/filters/parser/MP4Splitter/MP4Splitter.vcxproj index 1c7f48106..8eefd0181 100644 --- a/src/filters/parser/MP4Splitter/MP4Splitter.vcxproj +++ b/src/filters/parser/MP4Splitter/MP4Splitter.vcxproj @@ -247,16 +247,13 @@ </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug' or '$(Configuration)'=='Release'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug' or '$(Configuration)'=='Release'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug' or '$(Configuration)'=='Release'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="Ap4AsyncReaderStream.cpp" />
<ClCompile Include="AP4\Core\Ap4Atom.cpp" />
@@ -421,12 +418,9 @@ <ClInclude Include="AP4\Crypto\Ap4StreamCipher.h" />
<ClInclude Include="MP4Splitter.h" />
<ClInclude Include="MP4SplitterFile.h" />
- <CustomBuildStep Include="resource.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuildStep>
+ <ClInclude Include="resource.h">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug' or '$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClInclude>
<ClInclude Include="stdafx.h" />
<CustomBuildStep Include="AP4\Core\Ap4DcomAtom.h" />
</ItemGroup>
@@ -435,10 +429,7 @@ </ItemGroup>
<ItemGroup>
<ResourceCompile Include="MP4Splitter.rc">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug' or '$(Configuration)'=='Release'">true</ExcludedFromBuild>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
diff --git a/src/filters/parser/MP4Splitter/MP4Splitter.vcxproj.filters b/src/filters/parser/MP4Splitter/MP4Splitter.vcxproj.filters index 8603d74b3..8d610b2c9 100644 --- a/src/filters/parser/MP4Splitter/MP4Splitter.vcxproj.filters +++ b/src/filters/parser/MP4Splitter/MP4Splitter.vcxproj.filters @@ -260,6 +260,9 @@ <ClInclude Include="MP4SplitterFile.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="resource.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="stdafx.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -505,9 +508,4 @@ <Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
- <ItemGroup>
- <CustomBuildStep Include="resource.h">
- <Filter>Header Files</Filter>
- </CustomBuildStep>
- </ItemGroup>
</Project>
\ No newline at end of file |