Skip to content

Commit 8808f7a

Browse files
walbournwalbourn
committed
Workaround for VS 2017 (15.8) /permissive- and Windows 10 SDK (17134) C++/WinRT headers
1 parent 43edda1 commit 8808f7a

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

‎UWPSamples/IntroGraphics/SimpleTriangleCppWinRT_UWP/SimpleTriangleCppWinRT_UWP.vcxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
118118
<AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
119119
<ForcedUsingFiles />
120-
<AdditionalOptions>/bigobj /await %(AdditionalOptions)</AdditionalOptions>
120+
<AdditionalOptions>/bigobj /await /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
121121
<WarningLevel>Level4</WarningLevel>
122122
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
123123
<FloatingPointModel>Fast</FloatingPointModel>
@@ -140,7 +140,7 @@
140140
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
141141
<AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
142142
<ForcedUsingFiles />
143-
<AdditionalOptions>/bigobj /await %(AdditionalOptions)</AdditionalOptions>
143+
<AdditionalOptions>/bigobj /await /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
144144
<WarningLevel>Level4</WarningLevel>
145145
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
146146
<FloatingPointModel>Fast</FloatingPointModel>
@@ -163,7 +163,7 @@
163163
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
164164
<AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
165165
<ForcedUsingFiles />
166-
<AdditionalOptions>/bigobj /await %(AdditionalOptions)</AdditionalOptions>
166+
<AdditionalOptions>/bigobj /await /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
167167
<WarningLevel>Level4</WarningLevel>
168168
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
169169
<FloatingPointModel>Fast</FloatingPointModel>
@@ -187,7 +187,7 @@
187187
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
188188
<AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
189189
<ForcedUsingFiles />
190-
<AdditionalOptions>/bigobj /await %(AdditionalOptions)</AdditionalOptions>
190+
<AdditionalOptions>/bigobj /await /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
191191
<WarningLevel>Level4</WarningLevel>
192192
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
193193
<FloatingPointModel>Fast</FloatingPointModel>
@@ -211,7 +211,7 @@
211211
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
212212
<AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
213213
<ForcedUsingFiles />
214-
<AdditionalOptions>/bigobj /await %(AdditionalOptions)</AdditionalOptions>
214+
<AdditionalOptions>/bigobj /await /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
215215
<WarningLevel>Level4</WarningLevel>
216216
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
217217
<FloatingPointModel>Fast</FloatingPointModel>
@@ -234,7 +234,7 @@
234234
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
235235
<AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
236236
<ForcedUsingFiles />
237-
<AdditionalOptions>/bigobj /await %(AdditionalOptions)</AdditionalOptions>
237+
<AdditionalOptions>/bigobj /await /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
238238
<WarningLevel>Level4</WarningLevel>
239239
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
240240
<FloatingPointModel>Fast</FloatingPointModel>

‎UWPSamples/IntroGraphics/SimpleTriangleCppWinRT_UWP12/SimpleTriangleCppWinRT_UWP12.vcxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
118118
<AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK12\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
119119
<ForcedUsingFiles />
120-
<AdditionalOptions>/bigobj /await %(AdditionalOptions)</AdditionalOptions>
120+
<AdditionalOptions>/bigobj /await /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
121121
<WarningLevel>Level4</WarningLevel>
122122
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
123123
<FloatingPointModel>Fast</FloatingPointModel>
@@ -140,7 +140,7 @@
140140
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
141141
<AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK12\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
142142
<ForcedUsingFiles />
143-
<AdditionalOptions>/bigobj /await %(AdditionalOptions)</AdditionalOptions>
143+
<AdditionalOptions>/bigobj /await /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
144144
<WarningLevel>Level4</WarningLevel>
145145
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
146146
<FloatingPointModel>Fast</FloatingPointModel>
@@ -163,7 +163,7 @@
163163
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
164164
<AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK12\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
165165
<ForcedUsingFiles />
166-
<AdditionalOptions>/bigobj /await %(AdditionalOptions)</AdditionalOptions>
166+
<AdditionalOptions>/bigobj /await /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
167167
<WarningLevel>Level4</WarningLevel>
168168
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
169169
<FloatingPointModel>Fast</FloatingPointModel>
@@ -187,7 +187,7 @@
187187
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
188188
<AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK12\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
189189
<ForcedUsingFiles />
190-
<AdditionalOptions>/bigobj /await %(AdditionalOptions)</AdditionalOptions>
190+
<AdditionalOptions>/bigobj /await /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
191191
<WarningLevel>Level4</WarningLevel>
192192
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
193193
<FloatingPointModel>Fast</FloatingPointModel>
@@ -211,7 +211,7 @@
211211
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
212212
<AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK12\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
213213
<ForcedUsingFiles />
214-
<AdditionalOptions>/bigobj /await %(AdditionalOptions)</AdditionalOptions>
214+
<AdditionalOptions>/bigobj /await /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
215215
<WarningLevel>Level4</WarningLevel>
216216
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
217217
<FloatingPointModel>Fast</FloatingPointModel>
@@ -234,7 +234,7 @@
234234
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
235235
<AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK12\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
236236
<ForcedUsingFiles />
237-
<AdditionalOptions>/bigobj /await %(AdditionalOptions)</AdditionalOptions>
237+
<AdditionalOptions>/bigobj /await /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
238238
<WarningLevel>Level4</WarningLevel>
239239
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
240240
<FloatingPointModel>Fast</FloatingPointModel>

‎UWPSamples/System/GamepadCppWinRT_UWP/GamepadCppWinRT_UWP.vcxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
113113
<AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
114114
<ForcedUsingFiles />
115-
<AdditionalOptions>/bigobj /await</AdditionalOptions>
115+
<AdditionalOptions>/bigobj /await /Zc:twoPhase-</AdditionalOptions>
116116
<WarningLevel>Level4</WarningLevel>
117117
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
118118
<FloatingPointModel>Fast</FloatingPointModel>
@@ -135,7 +135,7 @@
135135
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
136136
<AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
137137
<ForcedUsingFiles />
138-
<AdditionalOptions>/bigobj /await</AdditionalOptions>
138+
<AdditionalOptions>/bigobj /await /Zc:twoPhase-</AdditionalOptions>
139139
<WarningLevel>Level4</WarningLevel>
140140
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
141141
<FloatingPointModel>Fast</FloatingPointModel>
@@ -158,7 +158,7 @@
158158
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
159159
<AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
160160
<ForcedUsingFiles />
161-
<AdditionalOptions>/bigobj /await</AdditionalOptions>
161+
<AdditionalOptions>/bigobj /await /Zc:twoPhase-</AdditionalOptions>
162162
<WarningLevel>Level4</WarningLevel>
163163
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
164164
<FloatingPointModel>Fast</FloatingPointModel>
@@ -182,7 +182,7 @@
182182
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
183183
<AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
184184
<ForcedUsingFiles />
185-
<AdditionalOptions>/bigobj /await</AdditionalOptions>
185+
<AdditionalOptions>/bigobj /await /Zc:twoPhase-</AdditionalOptions>
186186
<WarningLevel>Level4</WarningLevel>
187187
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
188188
<FloatingPointModel>Fast</FloatingPointModel>
@@ -206,7 +206,7 @@
206206
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
207207
<AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
208208
<ForcedUsingFiles />
209-
<AdditionalOptions>/bigobj /await</AdditionalOptions>
209+
<AdditionalOptions>/bigobj /await /Zc:twoPhase-</AdditionalOptions>
210210
<WarningLevel>Level4</WarningLevel>
211211
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
212212
<FloatingPointModel>Fast</FloatingPointModel>
@@ -229,7 +229,7 @@
229229
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
230230
<AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\..\Kits\DirectXTK\Inc;..\..\..\Kits\ATGTK;..\..\..\Kits\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
231231
<ForcedUsingFiles />
232-
<AdditionalOptions>/bigobj /await</AdditionalOptions>
232+
<AdditionalOptions>/bigobj /await /Zc:twoPhase-</AdditionalOptions>
233233
<WarningLevel>Level4</WarningLevel>
234234
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
235235
<FloatingPointModel>Fast</FloatingPointModel>

0 commit comments

Comments
 (0)