16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 10:29:19 +02:00

Merge branch 'tmj-dev'

This commit is contained in:
milek7
2018-02-16 15:25:53 +01:00
113 changed files with 4617 additions and 4057 deletions

View File

@@ -35,7 +35,6 @@ set(SOURCES
"Logs.cpp"
"McZapkie/friction.cpp"
"McZapkie/hamulce.cpp"
"McZapkie/mctools.cpp"
"McZapkie/Mover.cpp"
"McZapkie/Oerlikon_ESt.cpp"
"MdlMngr.cpp"
@@ -78,6 +77,9 @@ set(SOURCES
"audio.cpp"
"audiorenderer.cpp"
"motiontelemetry.cpp"
"utilities.cpp"
"light.cpp"
"uitranscripts.cpp"
)
set (PREFIX "")
@@ -194,4 +196,4 @@ target_link_libraries(${PROJECT_NAME} ${libserialport_LIBRARY})
if (WIN32)
target_link_libraries(${PROJECT_NAME} ws2_32)
endif()
endif()