diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2017-06-12 07:21:48 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2017-06-12 07:21:48 +0200 |
| commit | 5b88ad389c9c50a3e0785b08f9572656b2d3fcda (patch) | |
| tree | 25c8373ecb52b57777e8b01af40747034e63dd89 | |
| parent | 466a0a8b251067cc74d8dddf7e4f50f44924a48d (diff) | |
cleanup
| -rw-r--r-- | cmake/opentrack-platform.cmake | 2 | ||||
| -rw-r--r-- | cmake/opentrack-qt.cmake | 2 | ||||
| -rw-r--r-- | filter-accela/ftnoir_filter_accela.cpp | 3 | ||||
| -rw-r--r-- | logic/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | logic/tracker.cpp | 1 |
5 files changed, 5 insertions, 5 deletions
diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake index 9c1d73a7..4351a28d 100644 --- a/cmake/opentrack-platform.cmake +++ b/cmake/opentrack-platform.cmake @@ -33,7 +33,7 @@ if(CMAKE_C_COMPILER_ID STREQUAL "Clang") endif() if((NOT CMAKE_COMPILER_IS_GNUCXX) EQUAL (NOT (NOT CMAKE_COMPILER_IS_GNUCC))) - message(FATAL_ERROR "cannot use GNU C xor GNU C++") + message(FATAL_ERROR "cannot use either use both gcc and g++ or neither") endif() IF(CMAKE_SYSTEM_NAME STREQUAL "Linux") diff --git a/cmake/opentrack-qt.cmake b/cmake/opentrack-qt.cmake index 21bc42e1..7fc67415 100644 --- a/cmake/opentrack-qt.cmake +++ b/cmake/opentrack-qt.cmake @@ -8,7 +8,7 @@ if(WIN32) foreach(i Qt5Core Qt5Gui Qt5Network Qt5SerialPort Qt5Widgets) set(path "${Qt5_DIR}/../../../bin/${i}") install(FILES "${path}.dll" DESTINATION .) - if(EXISTS "${path}.pdb") + if(SDK_INSTALL_DEBUG_INFO AND EXISTS "${path}.pdb") install(FILES "${path}.pdb" DESTINATION "${opentrack-hier-debug}") endif() endforeach() diff --git a/filter-accela/ftnoir_filter_accela.cpp b/filter-accela/ftnoir_filter_accela.cpp index 0336221e..bdf8067d 100644 --- a/filter-accela/ftnoir_filter_accela.cpp +++ b/filter-accela/ftnoir_filter_accela.cpp @@ -164,8 +164,9 @@ void settings_accela::make_splines(spline& rot, spline& pos) pos = spline(); rot.set_max_input(rot_gains[0].x); - pos.set_max_input(pos_gains[0].x); rot.set_max_output(rot_gains[0].y); + + pos.set_max_input(pos_gains[0].x); pos.set_max_output(pos_gains[0].y); for (const auto& val : rot_gains) diff --git a/logic/CMakeLists.txt b/logic/CMakeLists.txt index 177dd045..f3f128af 100644 --- a/logic/CMakeLists.txt +++ b/logic/CMakeLists.txt @@ -3,5 +3,5 @@ target_link_libraries(opentrack-logic opentrack-spline) if(NOT WIN32) target_link_libraries(opentrack-logic opentrack-qxt-mini) else() - target_link_libraries(opentrack-logic opentrack-dinput) + target_link_libraries(opentrack-logic opentrack-dinput winmm) endif() diff --git a/logic/tracker.cpp b/logic/tracker.cpp index 87706293..24eaa6ad 100644 --- a/logic/tracker.cpp +++ b/logic/tracker.cpp @@ -215,7 +215,6 @@ void Tracker::logic() { // inertial case 0: - //scaled_rotation.rotation = scaled_rotation rotation = scaled_rotation.rot_center * scaled_rotation.rotation; break; // camera |