Commit 8808f7a7 authored by Chuck Walbourn's avatar Chuck Walbourn
Browse files

Workaround for VS 2017 (15.8) /permissive- and Windows 10 SDK (17134) C++/WinRT headers

parent 43edda1c

UWPSamples/IntroGraphics/SimpleTriangleCppWinRT_UWP/SimpleTriangleCppWinRT_UWP.vcxproj

+6 −6
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ 
      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>

      <AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <ForcedUsingFiles />

      <AdditionalOptions>/bigobj /await %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/bigobj /await /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

      <WarningLevel>Level4</WarningLevel>

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

      <FloatingPointModel>Fast</FloatingPointModel>
@@ -140,7 +140,7 @@ 
      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>

      <AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <ForcedUsingFiles />

      <AdditionalOptions>/bigobj /await %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/bigobj /await /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

      <WarningLevel>Level4</WarningLevel>

      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <FloatingPointModel>Fast</FloatingPointModel>
@@ -163,7 +163,7 @@ 
      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>

      <AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <ForcedUsingFiles />

      <AdditionalOptions>/bigobj /await %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/bigobj /await /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

      <WarningLevel>Level4</WarningLevel>

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

      <FloatingPointModel>Fast</FloatingPointModel>
@@ -187,7 +187,7 @@ 
      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>

      <AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <ForcedUsingFiles />

      <AdditionalOptions>/bigobj /await %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/bigobj /await /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

      <WarningLevel>Level4</WarningLevel>

      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <FloatingPointModel>Fast</FloatingPointModel>
@@ -211,7 +211,7 @@ 
      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>

      <AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <ForcedUsingFiles />

      <AdditionalOptions>/bigobj /await %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/bigobj /await /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

      <WarningLevel>Level4</WarningLevel>

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

      <FloatingPointModel>Fast</FloatingPointModel>
@@ -234,7 +234,7 @@ 
      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>

      <AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <ForcedUsingFiles />

      <AdditionalOptions>/bigobj /await %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/bigobj /await /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

      <WarningLevel>Level4</WarningLevel>

      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <FloatingPointModel>Fast</FloatingPointModel>

UWPSamples/IntroGraphics/SimpleTriangleCppWinRT_UWP12/SimpleTriangleCppWinRT_UWP12.vcxproj

+6 −6
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ 
      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>

      <AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK12\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <ForcedUsingFiles />

      <AdditionalOptions>/bigobj /await %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/bigobj /await /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

      <WarningLevel>Level4</WarningLevel>

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

      <FloatingPointModel>Fast</FloatingPointModel>
@@ -140,7 +140,7 @@ 
      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>

      <AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK12\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <ForcedUsingFiles />

      <AdditionalOptions>/bigobj /await %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/bigobj /await /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

      <WarningLevel>Level4</WarningLevel>

      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <FloatingPointModel>Fast</FloatingPointModel>
@@ -163,7 +163,7 @@ 
      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>

      <AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK12\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <ForcedUsingFiles />

      <AdditionalOptions>/bigobj /await %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/bigobj /await /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

      <WarningLevel>Level4</WarningLevel>

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

      <FloatingPointModel>Fast</FloatingPointModel>
@@ -187,7 +187,7 @@ 
      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>

      <AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK12\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <ForcedUsingFiles />

      <AdditionalOptions>/bigobj /await %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/bigobj /await /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

      <WarningLevel>Level4</WarningLevel>

      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <FloatingPointModel>Fast</FloatingPointModel>
@@ -211,7 +211,7 @@ 
      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>

      <AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK12\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <ForcedUsingFiles />

      <AdditionalOptions>/bigobj /await %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/bigobj /await /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

      <WarningLevel>Level4</WarningLevel>

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

      <FloatingPointModel>Fast</FloatingPointModel>
@@ -234,7 +234,7 @@ 
      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>

      <AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK12\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <ForcedUsingFiles />

      <AdditionalOptions>/bigobj /await %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/bigobj /await /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

      <WarningLevel>Level4</WarningLevel>

      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <FloatingPointModel>Fast</FloatingPointModel>

UWPSamples/System/GamepadCppWinRT_UWP/GamepadCppWinRT_UWP.vcxproj

+6 −6
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ 
      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>

      <AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <ForcedUsingFiles />

      <AdditionalOptions>/bigobj /await</AdditionalOptions>

      <AdditionalOptions>/bigobj /await /Zc:twoPhase-</AdditionalOptions>

      <WarningLevel>Level4</WarningLevel>

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

      <FloatingPointModel>Fast</FloatingPointModel>
@@ -135,7 +135,7 @@ 
      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>

      <AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <ForcedUsingFiles />

      <AdditionalOptions>/bigobj /await</AdditionalOptions>

      <AdditionalOptions>/bigobj /await /Zc:twoPhase-</AdditionalOptions>

      <WarningLevel>Level4</WarningLevel>

      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <FloatingPointModel>Fast</FloatingPointModel>
@@ -158,7 +158,7 @@ 
      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>

      <AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <ForcedUsingFiles />

      <AdditionalOptions>/bigobj /await</AdditionalOptions>

      <AdditionalOptions>/bigobj /await /Zc:twoPhase-</AdditionalOptions>

      <WarningLevel>Level4</WarningLevel>

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

      <FloatingPointModel>Fast</FloatingPointModel>
@@ -182,7 +182,7 @@ 
      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>

      <AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <ForcedUsingFiles />

      <AdditionalOptions>/bigobj /await</AdditionalOptions>

      <AdditionalOptions>/bigobj /await /Zc:twoPhase-</AdditionalOptions>

      <WarningLevel>Level4</WarningLevel>

      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <FloatingPointModel>Fast</FloatingPointModel>
@@ -206,7 +206,7 @@ 
      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>

      <AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <ForcedUsingFiles />

      <AdditionalOptions>/bigobj /await</AdditionalOptions>

      <AdditionalOptions>/bigobj /await /Zc:twoPhase-</AdditionalOptions>

      <WarningLevel>Level4</WarningLevel>

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

      <FloatingPointModel>Fast</FloatingPointModel>
@@ -229,7 +229,7 @@ 
      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>

      <AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <ForcedUsingFiles />

      <AdditionalOptions>/bigobj /await</AdditionalOptions>

      <AdditionalOptions>/bigobj /await /Zc:twoPhase-</AdditionalOptions>

      <WarningLevel>Level4</WarningLevel>

      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <FloatingPointModel>Fast</FloatingPointModel>