Skip to content

Commit 068e9d0

Browse files
yl-msftyl-msft
authored
Bring Bryce's fix for recent build break due to VS 16.7.1 upgrade. (#57)
* Bring Bryce's fix for recent build break due to VS 16.7.1 upgrade. * Remove some unnecessary conditions.
1 parent 6574e5d commit 068e9d0

5 files changed

Lines changed: 27 additions & 31 deletions

File tree

‎Directory.Build.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<ItemDefinitionGroup>
44
<ClCompile>
5-
<AdditionalIncludeDirectories>$(OpenXrSdkPath)\include;$(SharedPath);$(SharedPath)\ext;$(IntDir)\CompiledShaders;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
5+
<AdditionalIncludeDirectories>$(OpenXrSdkPath)\include;$(SharedPath);$(SharedPath)\ext;$(IntDir);%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
66
</ClCompile>
77
</ItemDefinitionGroup>
88

‎shared/gltf/Gltf_uwp.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
</ImportGroup>
9393
<PropertyGroup Label="UserMacros" />
9494
<PropertyGroup>
95-
<IncludePath>..;..\ext;$(IntDir)\CompiledShaders;$(IncludePath);</IncludePath>
95+
<IncludePath>..;..\ext;$(IncludePath);</IncludePath>
9696
</PropertyGroup>
9797
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
9898
<LinkIncremental>true</LinkIncremental>

‎shared/gltf/Gltf_win32.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
115115
</PropertyGroup>
116116
<PropertyGroup>
117-
<IncludePath>..;..\ext;$(IntDir)\CompiledShaders;$(IncludePath);</IncludePath>
117+
<IncludePath>..;..\ext;$(IncludePath);</IncludePath>
118118
</PropertyGroup>
119119
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
120120
<ClCompile>

‎shared/pbr/pbr_uwp.vcxproj‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
<LinkIncremental>false</LinkIncremental>
160160
</PropertyGroup>
161161
<PropertyGroup>
162-
<IncludePath>..;..\ext;$(IntDir)\CompiledShaders;$(IncludePath);</IncludePath>
162+
<IncludePath>..;..\ext;$(IntDir);$(IncludePath);</IncludePath>
163163
</PropertyGroup>
164164
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
165165
<ClCompile>
@@ -375,15 +375,15 @@
375375
<FileType>Document</FileType>
376376
<ShaderModel>5.0</ShaderModel>
377377
<VariableName>g_%(Filename)</VariableName>
378-
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\CompiledShaders\%(Filename).h</HeaderFileOutput>
379-
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
378+
<HeaderFileOutput>$(IntDir)\%(Filename).h</HeaderFileOutput>
379+
<ObjectFileOutput />
380380
</None>
381381
<None Include="Shaders\PbrShared.hlsl">
382382
<FileType>Document</FileType>
383383
<ShaderModel>5.0</ShaderModel>
384384
<VariableName>g_%(Filename)</VariableName>
385-
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\CompiledShaders\%(Filename).h</HeaderFileOutput>
386-
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
385+
<HeaderFileOutput>$(IntDir)\%(Filename).h</HeaderFileOutput>
386+
<ObjectFileOutput />
387387
</None>
388388
<FxCompile Include="Shaders\PbrPixelShader.hlsl">
389389
<FileType>Document</FileType>
@@ -392,41 +392,39 @@
392392
<VariableName>g_psPbrMain</VariableName>
393393
<EnableDebuggingInformation>true</EnableDebuggingInformation>
394394
<VariableName>g_%(Filename)</VariableName>
395-
<HeaderFileOutput>$(IntDir)\CompiledShaders\%(Filename).h</HeaderFileOutput>
395+
<HeaderFileOutput>$(IntDir)\%(Filename).h</HeaderFileOutput>
396396
<ObjectFileOutput />
397397
</FxCompile>
398398
<FxCompile Include="Shaders\PbrVertexShader.hlsl">
399399
<FileType>Document</FileType>
400400
<DeploymentContent>false</DeploymentContent>
401-
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
402401
<ShaderType>Vertex</ShaderType>
403402
<ShaderModel>5.0</ShaderModel>
404403
<VariableName>g_%(Filename)</VariableName>
405404
<ObjectFileOutput />
406-
<HeaderFileOutput>$(IntDir)\CompiledShaders\%(Filename).h</HeaderFileOutput>
405+
<HeaderFileOutput>$(IntDir)\%(Filename).h</HeaderFileOutput>
407406
<DeploymentContent />
408407
</FxCompile>
409408
<None Include="Shaders\HighlightShared.hlsl">
410409
<FileType>Document</FileType>
411410
<ShaderModel>5.0</ShaderModel>
412411
<VariableName>g_%(Filename)</VariableName>
413-
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\CompiledShaders\%(Filename).h</HeaderFileOutput>
414-
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
412+
<HeaderFileOutput>$(IntDir)\%(Filename).h</HeaderFileOutput>
413+
<ObjectFileOutput />
415414
</None>
416415
<FxCompile Include="Shaders\HighlightPixelShader.hlsl">
417416
<ShaderType>Pixel</ShaderType>
418417
<ShaderModel>5.0</ShaderModel>
419418
<VariableName>g_%(Filename)</VariableName>
420-
<HeaderFileOutput>$(IntDir)\CompiledShaders\%(Filename).h</HeaderFileOutput>
419+
<HeaderFileOutput>$(IntDir)\%(Filename).h</HeaderFileOutput>
421420
<ObjectFileOutput />
422421
</FxCompile>
423422
<FxCompile Include="Shaders\HighlightVertexShader.hlsl">
424423
<ShaderType>Vertex</ShaderType>
425424
<ShaderModel>5.0</ShaderModel>
426425
<VariableName>g_%(Filename)</VariableName>
427-
<HeaderFileOutput>$(IntDir)\CompiledShaders\%(Filename).h</HeaderFileOutput>
428-
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
429-
</ObjectFileOutput>
426+
<HeaderFileOutput>$(IntDir)\%(Filename).h</HeaderFileOutput>
427+
<ObjectFileOutput />
430428
</FxCompile>
431429
</ItemGroup>
432430
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

‎shared/pbr/pbr_win32.vcxproj‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
<PropertyGroup>
133133
</PropertyGroup>
134134
<PropertyGroup>
135-
<IncludePath>..;..\ext;$(IntDir)\CompiledShaders;$(IncludePath);</IncludePath>
135+
<IncludePath>..;..\ext;$(IntDir);$(IncludePath);</IncludePath>
136136
</PropertyGroup>
137137
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
138138
<LinkIncremental>true</LinkIncremental>
@@ -351,15 +351,15 @@
351351
<FileType>Document</FileType>
352352
<ShaderModel>5.0</ShaderModel>
353353
<VariableName>g_%(Filename)</VariableName>
354-
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\CompiledShaders\%(Filename).h</HeaderFileOutput>
355-
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
354+
<HeaderFileOutput>$(IntDir)\%(Filename).h</HeaderFileOutput>
355+
<ObjectFileOutput />
356356
</None>
357357
<None Include="Shaders\PbrShared.hlsl">
358358
<FileType>Document</FileType>
359359
<ShaderModel>5.0</ShaderModel>
360360
<VariableName>g_%(Filename)</VariableName>
361-
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\CompiledShaders\%(Filename).h</HeaderFileOutput>
362-
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
361+
<HeaderFileOutput>$(IntDir)\%(Filename).h</HeaderFileOutput>
362+
<ObjectFileOutput />
363363
</None>
364364
<FxCompile Include="Shaders\PbrPixelShader.hlsl">
365365
<FileType>Document</FileType>
@@ -368,41 +368,39 @@
368368
<VariableName>g_psPbrMain</VariableName>
369369
<EnableDebuggingInformation>true</EnableDebuggingInformation>
370370
<VariableName>g_%(Filename)</VariableName>
371-
<HeaderFileOutput>$(IntDir)\CompiledShaders\%(Filename).h</HeaderFileOutput>
371+
<HeaderFileOutput>$(IntDir)\%(Filename).h</HeaderFileOutput>
372372
<ObjectFileOutput />
373373
</FxCompile>
374374
<FxCompile Include="Shaders\PbrVertexShader.hlsl">
375375
<FileType>Document</FileType>
376376
<DeploymentContent>false</DeploymentContent>
377-
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
378377
<ShaderType>Vertex</ShaderType>
379378
<ShaderModel>5.0</ShaderModel>
380379
<VariableName>g_%(Filename)</VariableName>
381380
<ObjectFileOutput />
382-
<HeaderFileOutput>$(IntDir)\CompiledShaders\%(Filename).h</HeaderFileOutput>
381+
<HeaderFileOutput>$(IntDir)\%(Filename).h</HeaderFileOutput>
383382
<DeploymentContent />
384383
</FxCompile>
385384
<None Include="Shaders\HighlightShared.hlsl">
386385
<FileType>Document</FileType>
387386
<ShaderModel>5.0</ShaderModel>
388387
<VariableName>g_%(Filename)</VariableName>
389-
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\CompiledShaders\%(Filename).h</HeaderFileOutput>
390-
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
388+
<HeaderFileOutput>$(IntDir)\%(Filename).h</HeaderFileOutput>
389+
<ObjectFileOutput />
391390
</None>
392391
<FxCompile Include="Shaders\HighlightPixelShader.hlsl">
393392
<ShaderType>Pixel</ShaderType>
394393
<ShaderModel>5.0</ShaderModel>
395394
<VariableName>g_%(Filename)</VariableName>
396-
<HeaderFileOutput>$(IntDir)\CompiledShaders\%(Filename).h</HeaderFileOutput>
395+
<HeaderFileOutput>$(IntDir)\%(Filename).h</HeaderFileOutput>
397396
<ObjectFileOutput />
398397
</FxCompile>
399398
<FxCompile Include="Shaders\HighlightVertexShader.hlsl">
400399
<ShaderType>Vertex</ShaderType>
401400
<ShaderModel>5.0</ShaderModel>
402401
<VariableName>g_%(Filename)</VariableName>
403-
<HeaderFileOutput>$(IntDir)\CompiledShaders\%(Filename).h</HeaderFileOutput>
404-
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
405-
</ObjectFileOutput>
402+
<HeaderFileOutput>$(IntDir)\%(Filename).h</HeaderFileOutput>
403+
<ObjectFileOutput />
406404
</FxCompile>
407405
</ItemGroup>
408406
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

0 commit comments

Comments
 (0)