Skip to content

Commit

Permalink
Update to The-Forge 1.57
Browse files Browse the repository at this point in the history
  • Loading branch information
wutipong committed May 13, 2024
1 parent 836afb4 commit d86e958
Show file tree
Hide file tree
Showing 4 changed files with 267 additions and 343 deletions.
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -263,12 +263,12 @@ elseif (LINUX)
)
endif()

target_compile_features(main PRIVATE cxx_std_20)
set_property(TARGET main PROPERTY CXX_STANDARD 20)
target_compile_features(main PRIVATE cxx_std_17)
set_property(TARGET main PROPERTY CXX_STANDARD 17)
set_property(TARGET main PROPERTY CXX_STANDARD_REQUIRED ON)

if (MSVC)
# set_property(TARGET main PROPERTY WIN32_EXECUTABLE ON)
add_compile_definitions(D3D12_AGILITY_SDK_VERSION 611)
target_compile_options(main PRIVATE /Zc:__cplusplus)
endif ()

Expand Down Expand Up @@ -299,7 +299,7 @@ add_custom_target(CopyGpuCfg ALL

add_custom_target(CopyFonts ALL
COMMAND ${CMAKE_COMMAND} -E make_directory "$<TARGET_FILE_DIR:main>/Fonts/TitilliumText/"
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/The-Forge/Examples_3/Unit_Tests/UnitTestResources/Fonts/TitilliumText/TitilliumText-Bold.otf" "$<TARGET_FILE_DIR:main>/Fonts/TitilliumText/"
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/The-Forge/Examples_3/Visibility_Buffer/Resources/Fonts/TitilliumText/TitilliumText-Bold.otf" "$<TARGET_FILE_DIR:main>/Fonts/TitilliumText/"
)

if(WIN32)
Expand Down
2 changes: 1 addition & 1 deletion The-Forge
Submodule The-Forge updated 476 files
Loading

0 comments on commit d86e958

Please sign in to comment.