diff options
| -rw-r--r-- | src/common.props | 3 | ||||
| -rw-r--r-- | src/filters/reader/CDXAReader/CDXAReader.vcxproj | 3 | ||||
| -rw-r--r-- | src/filters/renderer/VideoRenderers/VideoRenderers.vcxproj.filters | 6 | ||||
| -rw-r--r-- | src/filters/transform/VSFilter/VSFilter.vcxproj | 6 | ||||
| -rw-r--r-- | src/thirdparty/ZenLib/ZenLib.vcxproj.filters | 3 |
5 files changed, 17 insertions, 4 deletions
diff --git a/src/common.props b/src/common.props index 601ca1fed..1ffbefd12 100644 --- a/src/common.props +++ b/src/common.props @@ -12,8 +12,7 @@ </PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalOptions>/w34701 /w34706 /Zo /Zc:rvalueCast %(AdditionalOptions)</AdditionalOptions>
- <AdditionalOptions Condition="'$(PlatformToolsetVersion)'=='140'">/Zc:throwingNew %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalOptions>/w34701 /w34706 /Zo /Zc:throwingNew /Zc:rvalueCast %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions Condition="'$(ANALYZE)'=='true'">/wd4005 /wd6031 /wd6246 /wd6309 /wd6387 /wd28204 %(AdditionalOptions)</AdditionalOptions>
<EnablePREfast Condition="'$(ANALYZE)'=='true'">true</EnablePREfast>
<BufferSecurityCheck>true</BufferSecurityCheck>
diff --git a/src/filters/reader/CDXAReader/CDXAReader.vcxproj b/src/filters/reader/CDXAReader/CDXAReader.vcxproj index 441029df8..c593478c4 100644 --- a/src/filters/reader/CDXAReader/CDXAReader.vcxproj +++ b/src/filters/reader/CDXAReader/CDXAReader.vcxproj @@ -41,7 +41,8 @@ <ProjectName>CDXAReader</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <Import Project="..\..\..\platform.props" /> <PropertyGroup Label="Configuration">
+ <Import Project="..\..\..\platform.props" />
+ <PropertyGroup Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>Static</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
diff --git a/src/filters/renderer/VideoRenderers/VideoRenderers.vcxproj.filters b/src/filters/renderer/VideoRenderers/VideoRenderers.vcxproj.filters index 467f78f57..98c44fd6a 100644 --- a/src/filters/renderer/VideoRenderers/VideoRenderers.vcxproj.filters +++ b/src/filters/renderer/VideoRenderers/VideoRenderers.vcxproj.filters @@ -71,6 +71,9 @@ <ClCompile Include="FocusThread.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="PixelShaderCache.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="AllocatorCommon.h">
@@ -142,5 +145,8 @@ <ClInclude Include="AsyncCallback.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="PixelShaderCache.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file diff --git a/src/filters/transform/VSFilter/VSFilter.vcxproj b/src/filters/transform/VSFilter/VSFilter.vcxproj index 88341529c..f6667556a 100644 --- a/src/filters/transform/VSFilter/VSFilter.vcxproj +++ b/src/filters/transform/VSFilter/VSFilter.vcxproj @@ -41,7 +41,11 @@ <PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalOptions Condition="'$(PlatformToolsetVersion)'=='140'">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
+ <!--
+ Remove /Zc:threadSafeInit- once Windows XP in no longer supported. TLS doesn't work on this system with dynamically loaded libraries.
+ And it will not be fixed. https://connect.microsoft.com/VisualStudio/feedback/details/1789709
+ -->
+ <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\thirdparty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ISOLATION_AWARE_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
diff --git a/src/thirdparty/ZenLib/ZenLib.vcxproj.filters b/src/thirdparty/ZenLib/ZenLib.vcxproj.filters index ac1bf4ea7..895bc70bf 100644 --- a/src/thirdparty/ZenLib/ZenLib.vcxproj.filters +++ b/src/thirdparty/ZenLib/ZenLib.vcxproj.filters @@ -193,5 +193,8 @@ <ClInclude Include="library\Source\ZenLib\PreComp.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="library\Source\ZenLib\MemoryUtils.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file |