diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2018-12-26 17:32:06 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2018-12-26 17:41:51 +0100 |
| commit | 51250d659681868b8adacd300099a82c0368f7f9 (patch) | |
| tree | 1e88be50863aad23036a7a8a8d68e857005fa1fa | |
| parent | 66685c866a34cee8016599d80565a13192740f02 (diff) | |
cruft
| -rw-r--r-- | cmake/opentrack-platform.cmake | 9 | ||||
| -rw-r--r-- | sdk-paths-sthalik@Clang-windows.cmake | 3 | ||||
| -rw-r--r-- | tracker-hydra/ftnoir_tracker_hydra.h | 13 |
3 files changed, 16 insertions, 9 deletions
diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake index 32599896..adfe58cc 100644 --- a/cmake/opentrack-platform.cmake +++ b/cmake/opentrack-platform.cmake @@ -108,13 +108,18 @@ if(MINGW) endif() if(MSVC) - add_definitions(-DNOMINMAX -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D_NO_DEBUG_HEAP) + add_definitions(-DNOMINMAX) + add_definitions(-DWIN32_LEAN_AND_MEAN) + add_definitions(-D_CRT_SECURE_NO_WARNINGS) + add_definitions(-D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1) + add_definitions(-D_SCL_SECURE_NO_WARNINGS) + add_definitions(-D_ITERATOR_DEBUG_LEVEL=0) add_definitions(-D_HAS_EXCEPTIONS=0) + add_definitions(-D_ENABLE_EXTENDED_ALIGNED_STORAGE) add_definitions(-D_SILENCE_CXX17_NEGATORS_DEPRECATION_WARNING) add_definitions(-D_SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING) - add_definitions(-DWIN32_LEAN_AND_MEAN) set(__stuff "-permissive- -diagnostics:caret") set(CMAKE_CXX_FLAGS "${__stuff} ${CMAKE_CXX_FLAGS}") diff --git a/sdk-paths-sthalik@Clang-windows.cmake b/sdk-paths-sthalik@Clang-windows.cmake index 817911bf..f1b17246 100644 --- a/sdk-paths-sthalik@Clang-windows.cmake +++ b/sdk-paths-sthalik@Clang-windows.cmake @@ -101,7 +101,7 @@ set(_cxxflags -Wpragmas -Wreorder -Wreturn-std-move - -Wself-assign-field + -Wself-assign -Wself-move -Wshadow-field-in-constructor-modified -Wsometimes-uninitialized @@ -123,6 +123,7 @@ set(_cxxflags -Wno-exit-time-destructors -Wno-deprecated -Wno-comma + -Wno-self-assign-overloaded ) set(base-cxxflags "") foreach(k ${_cxxflags}) diff --git a/tracker-hydra/ftnoir_tracker_hydra.h b/tracker-hydra/ftnoir_tracker_hydra.h index 9d0ab835..8af44344 100644 --- a/tracker-hydra/ftnoir_tracker_hydra.h +++ b/tracker-hydra/ftnoir_tracker_hydra.h @@ -5,7 +5,8 @@ #include "options/options.hpp" using namespace options; -struct settings : opts { +struct settings : opts +{ settings() : opts("tracker-hydra") {} @@ -15,7 +16,7 @@ class Hydra_Tracker : public ITracker { public: Hydra_Tracker(); - ~Hydra_Tracker(); + ~Hydra_Tracker() override; module_status start_tracker(QFrame *) override; void data(double *data) override; @@ -29,8 +30,8 @@ class dialog_hydra: public ITrackerDialog Q_OBJECT public: dialog_hydra(); - void register_tracker(ITracker *) {} - void unregister_tracker() {} + void register_tracker(ITracker *) override {} + void unregister_tracker() override {} private: settings s; Ui::UIHydraControls ui; @@ -43,7 +44,7 @@ class hydraDll : public Metadata { Q_OBJECT - QString name() { return QString("Razer Hydra -- inertial device"); } - QIcon icon() { return QIcon(":/images/opentrack.png"); } + QString name() override { return QString("Razer Hydra -- inertial device"); } + QIcon icon() override { return QIcon(":/images/opentrack.png"); } }; |