3 files changed, 10 insertions, 8 deletions
diff --git a/tracker-hydra/CMakeLists.txt b/tracker-hydra/CMakeLists.txt
index 2e263a19..b99c1d7a 100644
--- a/tracker-hydra/CMakeLists.txt
+++ b/tracker-hydra/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(SDK_HYDRA "" CACHE PATH "libSixense path for Razer Hydra")
-if(SDK_HYDRA)
+if(SDK_HYDRA AND opentrack-intel)
     otr_module(tracker-hydra)
     target_include_directories(opentrack-tracker-hydra SYSTEM PUBLIC ${SDK_HYDRA}/include ${SDK_HYDRA}/include/sixense_utils)
     if(opentrack-64bit)
diff --git a/tracker-hydra/ftnoir_tracker_hydra.cpp b/tracker-hydra/ftnoir_tracker_hydra.cpp
index 2e9e1fc5..5f548bd6 100644
--- a/tracker-hydra/ftnoir_tracker_hydra.cpp
+++ b/tracker-hydra/ftnoir_tracker_hydra.cpp
@@ -18,8 +18,9 @@
 #include <cstdio>
 #include <cmath>
 #ifdef _WIN32
+#   undef WIN32
+#   define WIN32
 #   define SIXENSE_STATIC_LIB
-#   define SIXENSE_UTILS_STATIC_LIB
 #endif
 #include <sixense.h>
 
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"); }
 };