Skip to content
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

Use -HV 2021 for DXC on PC when available #247

Merged
merged 7 commits into from
Aug 31, 2024
Merged

Use -HV 2021 for DXC on PC when available #247

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
16c9c64
Use -HV 2021 for DXC on PC when available
walbourn Aug 30, 2024
2ac780e
Add more checks
walbourn Aug 30, 2024
6d6a5c9
Remove unneeded shader ref
walbourn Aug 30, 2024
47e2182
YAML update for ADO
walbourn Aug 30, 2024
c67f767
Update CMake
walbourn Aug 30, 2024
9a983d1
Update CMake to specify DXC.EXE / FXC.EXE to use
walbourn Aug 30, 2024
3e44f45
Minor YAML update
walbourn Aug 30, 2024
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
Prev Previous commit
Next Next commit
Update CMake
  • Loading branch information
@walbourn
walbourn committed Aug 30, 2024
commit c67f767c4789f465d6452f39969ffa899dcf8228
9 changes: 7 additions & 2 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -70,6 +70,7 @@ elseif(WINDOWS_STORE)
endif()

include(GNUInstallDirs)
include(build/CompilerAndLinker.cmake)

#--- Library
set(LIBRARY_HEADERS
@@ -258,6 +259,12 @@ if(NOT USE_PREBUILT_SHADERS)
REQUIRED NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH NO_DEFAULT_PATH
HINTS ${DIRECTX_DXC_PATH}
"${CMAKE_CURRENT_LIST_DIR}/build/vcpkg_installed/${VCPKG_HOST_TRIPLET}/tools/directx-dxc")
elseif((NOT BUILD_SCARLETT_SHADERS) AND (NOT BUILD_XBOXONE_SHADERS))
find_program(DIRECTX_DXC_TOOL DXC.EXE
REQUIRED
HINTS "C:/Program Files (x86)/Windows Kits/10/bin/${CMAKE_SYSTEM_VERSION}/${DIRECTX_ARCH}"
"C:/Program Files (x86)/Windows Kits/10/bin/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/${DIRECTX_ARCH}")
message(STATUS "Using DirectXShaderCompiler found in ${DIRECTX_DXC_TOOL}")
endif()
add_custom_command(
OUTPUT "${COMPILED_SHADERS}/SpriteEffect_SpriteVertexShader.inc"
@@ -407,8 +414,6 @@ if(MSVC)
endif()
endif()

include(build/CompilerAndLinker.cmake)

target_compile_definitions(${PROJECT_NAME} PRIVATE ${COMPILER_DEFINES})
target_compile_options(${PROJECT_NAME} PRIVATE ${COMPILER_SWITCHES})
target_link_options(${PROJECT_NAME} PRIVATE ${LINKER_SWITCHES})
Loading