mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-19 14:42:28 +01:00
Merge remote-tracking branch 'origin/master' into feat/second-loco-engine-start
# Conflicts: # CMakeLists.txt
This commit is contained in:
@@ -160,6 +160,7 @@ set(SOURCES
|
||||
"world/station.cpp"
|
||||
"application/application.cpp"
|
||||
"simulation/simulationtime.cpp"
|
||||
"simulation/simulationtest.cpp"
|
||||
"scene/sceneeditor.cpp"
|
||||
"rendering/screenshot.cpp"
|
||||
"input/driverkeyboardinput.cpp"
|
||||
@@ -453,7 +454,7 @@ endif()
|
||||
add_library(eu07_settings INTERFACE)
|
||||
|
||||
# the parts of the simulation the game shares with the unit tests: the vehicle physics, the vehicle
|
||||
# definition parser and the helpers they use. built once, and tested as the game uses them
|
||||
# definition parser, the helpers they use and the rules of the test mode. built once, and tested as the game uses them
|
||||
set(CORE_SOURCES
|
||||
"McZapkie/friction.cpp"
|
||||
"McZapkie/hamulce.cpp"
|
||||
@@ -462,9 +463,11 @@ set(CORE_SOURCES
|
||||
"utilities/parser.cpp"
|
||||
"utilities/utilities.cpp"
|
||||
"scripting/ladderlogic.cpp"
|
||||
"simulation/simulationtestrules.cpp"
|
||||
"vehicle/enginestart.cpp"
|
||||
"vehicle/handover.cpp"
|
||||
"vehicle/horn.cpp"
|
||||
"vehicle/linebreaker.cpp"
|
||||
"vehicle/smoke.cpp"
|
||||
)
|
||||
add_library(eu07_core STATIC ${CORE_SOURCES})
|
||||
@@ -739,4 +742,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()
|
||||
|
||||
Reference in New Issue
Block a user