Skip to content

Fix D3D12RaytracingSakuraForestSER release build #971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jordan Saunders (jordan-xbox) wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −14
Open

Fix D3D12RaytracingSakuraForestSER release build #971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions Samples/Desktop/D3D12Raytracing/src/D3D12Raytracing.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,40 +7,40 @@
<Platform Name="ARM64" />
</Configurations>
<Folder Name="/MiniEngine/">
<Project Path="../../../../MiniEngine/Core/Core.vcxproj" />
<Project Path="../../../../MiniEngine/Model/Model.vcxproj" />
<Project Path="../../../../MiniEngine/Core/Core.vcxproj" Id="86a58508-0d6a-4786-a32f-01a301fdc6f3" />
<Project Path="../../../../MiniEngine/Model/Model.vcxproj" Id="5d3aeefb-8789-48e5-9bd9-09c667052d09" />
</Folder>
<Folder Name="/Samples/">
<File Path="../readme.md" />
</Folder>
<Folder Name="/Samples/Advanced/">
<Project Path="D3D12RaytracingMiniEngineSample/ModelViewer_VS16.vcxproj" />
<Project Path="D3D12RaytracingRealTimeDenoisedAmbientOcclusion/D3D12RaytracingRealTimeDenoisedAmbientOcclusion.vcxproj" />
<Project Path="D3D12RaytracingMiniEngineSample/ModelViewer_VS16.vcxproj" Id="315a1e1b-3732-41fe-9b4a-6a1e103ba2f5" />
<Project Path="D3D12RaytracingRealTimeDenoisedAmbientOcclusion/D3D12RaytracingRealTimeDenoisedAmbientOcclusion.vcxproj" Id="19585c81-fb12-4a4b-b700-cce253bdba02" />
</Folder>
<Folder Name="/Samples/Tutorials/">
<Project Path="D3D12OMMOfflineBaker/D3D12OMMOfflineBaker.vcxproj">
<Project Path="D3D12OMMOfflineBaker/D3D12OMMOfflineBaker.vcxproj" Id="2f201b6c-24b7-498c-a92a-07d4086ef6e9">
<BuildType Solution="Profile|*" Project="Release" />
<Build Project="false" />
</Project>
<Project Path="D3D12RaytracingHelloShaderExecutionReordering/D3D12RaytracingHelloShaderExecutionReordering.vcxproj">
<Project Path="D3D12RaytracingHelloShaderExecutionReordering/D3D12RaytracingHelloShaderExecutionReordering.vcxproj" Id="390a4d56-ff1b-4ca0-81ca-ac8ed273bfc9">
<BuildType Solution="Profile|*" Project="Release" />
</Project>
<Project Path="D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj">
<Project Path="D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj" Id="5018f6a3-6533-4744-b1fd-727d199fd2e9">
<BuildType Solution="Profile|*" Project="Release" />
</Project>
<Project Path="D3D12RaytracingLibrarySubobjects/D3D12RaytracingLibrarySubobjects.vcxproj">
<Project Path="D3D12RaytracingLibrarySubobjects/D3D12RaytracingLibrarySubobjects.vcxproj" Id="0af699f0-99a8-4493-9ff7-1ffde2900100">
<BuildType Solution="Profile|*" Project="Release" />
</Project>
<Project Path="D3D12RaytracingOpacityMicromaps/D3D12RaytracingOpacityMicromaps.vcxproj">
<Project Path="D3D12RaytracingOpacityMicromaps/D3D12RaytracingOpacityMicromaps.vcxproj" Id="a62c42da-dafa-47db-b370-d2ec5dab762d">
<BuildType Solution="Profile|*" Project="Release" />
</Project>
<Project Path="D3D12RaytracingProceduralGeometry/D3D12RaytracingProceduralGeometry.vcxproj">
<Project Path="D3D12RaytracingProceduralGeometry/D3D12RaytracingProceduralGeometry.vcxproj" Id="0c266269-ac0c-41b0-9d25-0117dc23cfc7">
<BuildType Solution="Profile|*" Project="Release" />
</Project>
<Project Path="D3D12RaytracingSakuraForestSER/D3D12RaytracingSakuraForestSER.vcxproj">
<Project Path="D3D12RaytracingSakuraForestSER/D3D12RaytracingSakuraForestSER.vcxproj" Id="8a6f63fd-e766-476b-9748-9c14737297b7">
<BuildType Solution="Profile|*" Project="Release" />
</Project>
<Project Path="D3D12RaytracingSimpleLighting/D3D12RaytracingSimpleLighting.vcxproj">
<Project Path="D3D12RaytracingSimpleLighting/D3D12RaytracingSimpleLighting.vcxproj" Id="a0848c98-f5aa-431c-9e76-7f1e7efa368c">
<BuildType Solution="Profile|*" Project="Release" />
</Project>
</Folder>
Expand Down
6 changes: 5 additions & 1 deletion ...D3D12Raytracing/src/D3D12RaytracingSakuraForestSER/D3D12RaytracingSakuraForestSER.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAsWinRT>false</CompileAsWinRT>
<LanguageStandard>stdcpp17</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand Down Expand Up @@ -274,6 +275,7 @@
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAsWinRT>false</CompileAsWinRT>
<LanguageStandard>stdcpp17</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand Down Expand Up @@ -350,6 +352,8 @@
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">6.9</ShaderModel>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
</FxCompile>
</ItemGroup>
<ItemGroup>
Expand All @@ -373,4 +377,4 @@
<Error Condition="!Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.DXC.1.9.2602.17\build\native\Microsoft.Direct3D.DXC.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\Microsoft.Direct3D.DXC.1.9.2602.17\build\native\Microsoft.Direct3D.DXC.props'))" />
<Error Condition="!Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.DXC.1.9.2602.17\build\native\Microsoft.Direct3D.DXC.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\Microsoft.Direct3D.DXC.1.9.2602.17\build\native\Microsoft.Direct3D.DXC.targets'))" />
</Target>
</Project>
</Project>
2 changes: 1 addition & 1 deletion ...tracing/src/D3D12RaytracingSakuraForestSER/D3D12RaytracingSakuraForestSER.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
<Filter>Assets\Shaders</Filter>
</ClInclude>
<ClInclude Include="D3D12RaytracingSakuraForestSER.h" />
<ClInclude Include="Star.hlsli" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="stdafx.cpp">
Expand All @@ -83,6 +84,5 @@
</ItemGroup>
<ItemGroup>
<FxCompile Include="Raytracing.hlsl" />
<FxCompile Include="Star.hlsl" />
</ItemGroup>
</Project>