18
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-21 03:54:57 +01:00

Merge remote-tracking branch 'origin/master' into fix/freight-brake-setting-cw1

# Conflicts:
#	CMakeLists.txt
#	utilities/Globals.cpp
This commit is contained in:
jerrrrycho
2026-11-09 15:32:03 +01:00
74 changed files with 3963 additions and 490 deletions

View File

@@ -464,6 +464,7 @@ set(CORE_SOURCES
"utilities/utilities.cpp"
"scripting/ladderlogic.cpp"
"simulation/simulationtestrules.cpp"
"vehicle/enginestart.cpp"
"vehicle/brakesetting.cpp"
"vehicle/handover.cpp"
"vehicle/horn.cpp"
@@ -742,4 +743,4 @@ if(WITH_TESTS)
# Visual Studio builds rerun them with the next change of the game)
set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY LINK_DEPENDS
$<TARGET_FILE:eu07_unit_tests> ${UNIT_TEST_DATA} "${CMAKE_CURRENT_SOURCE_DIR}/tests/unit/run_tests.cmake")
endif()
endif()