Merge remote-tracking branch 'origin/main' into randomizer

# Conflicts:
#	files.cmake
#	src/m_Do/m_Do_main.cpp
This commit is contained in:
CraftyBoss
2026-05-10 23:14:50 -07:00
19 changed files with 440 additions and 93 deletions
+6
View File
@@ -446,6 +446,12 @@ target_link_libraries(dusk PRIVATE aurora::main ${GAME_LIBS} ${JSYSTEM_LINK_LIBR
target_precompile_headers(dusk PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_SOURCE_DIR}/include/dusk_pch.hpp>")
if (TARGET crashpad_handler)
add_dependencies(dusk crashpad_handler)
add_custom_command(TARGET dusk POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"$<TARGET_FILE:crashpad_handler>"
"$<TARGET_FILE_DIR:dusk>"
COMMENT "Copying crashpad handler"
)
endif ()
if (ANDROID)