8 files changed, 14 insertions, 18 deletions
diff --git a/tracker-rs/CMakeLists.txt b/tracker-rs/CMakeLists.txt
index fc8eb75b..8350c551 100644
--- a/tracker-rs/CMakeLists.txt
+++ b/tracker-rs/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(SDK_REALSENSE "$ENV{RSSDK_DIR}" CACHE PATH "Intel RealSense SDK dir")
 
-if(WIN32 AND SDK_REALSENSE)
+if(WIN32 AND SDK_REALSENSE AND opentrack-intel)
     if(CMAKE_COMPILER_IS_GNUCC)
         add_definitions(-fpermissive -Wno-error) # for SDK headers
     endif()
diff --git a/tracker-rs/ftnoir_tracker_rs.h b/tracker-rs/ftnoir_tracker_rs.h
index 881e03ca..f322d0f6 100644
--- a/tracker-rs/ftnoir_tracker_rs.h
+++ b/tracker-rs/ftnoir_tracker_rs.h
@@ -20,7 +20,7 @@ class RSTracker : public QObject, public ITracker
 
 public:
     RSTracker();
-    ~RSTracker();
+    ~RSTracker() override;
     module_status start_tracker(QFrame *) override;
     void data(double *data) override;
 
@@ -50,6 +50,6 @@ class RSTrackerMetaData : public Metadata
 {
     Q_OBJECT
 
-    QString name();
-    QIcon icon();
+    QString name() override;
+    QIcon icon() override;
 };
diff --git a/tracker-rs/ftnoir_tracker_rs_worker.cpp b/tracker-rs/ftnoir_tracker_rs_worker.cpp
index 0e2c86f4..15843824 100644
--- a/tracker-rs/ftnoir_tracker_rs_worker.cpp
+++ b/tracker-rs/ftnoir_tracker_rs_worker.cpp
@@ -7,6 +7,7 @@
 
 #include "ftnoir_tracker_rs_worker.h"
 #include "rs_impl/ftnoir_tracker_rs_impl.h"
+#include <cstdlib>
 #include <QImage>
 #include <QDebug>
 
diff --git a/tracker-rs/ftnoir_tracker_rs_worker.h b/tracker-rs/ftnoir_tracker_rs_worker.h
index 098d6c10..8758e520 100644
--- a/tracker-rs/ftnoir_tracker_rs_worker.h
+++ b/tracker-rs/ftnoir_tracker_rs_worker.h
@@ -16,7 +16,7 @@ class RSTrackerWorkerThread : public QThread
 
 public:
     RSTrackerWorkerThread();
-    ~RSTrackerWorkerThread();
+    ~RSTrackerWorkerThread() override;
 
     void getPose(double* pose);
     const QImage getPreview();
diff --git a/tracker-rs/imagewidget.h b/tracker-rs/imagewidget.h
index f04eb1a3..a6d5932b 100644
--- a/tracker-rs/imagewidget.h
+++ b/tracker-rs/imagewidget.h
@@ -14,7 +14,7 @@
 class ImageWidget : public QWidget {
   Q_OBJECT
 public:
-  ImageWidget(QWidget* parent = 0);
+  ImageWidget(QWidget* parent = nullptr);
   void setImage(QImage image);
 
 private:
diff --git a/tracker-rs/rs_impl/CMakeLists.txt b/tracker-rs/rs_impl/CMakeLists.txt
index d4bf0925..97c6fd99 100644
--- a/tracker-rs/rs_impl/CMakeLists.txt
+++ b/tracker-rs/rs_impl/CMakeLists.txt
@@ -5,7 +5,7 @@ if(WIN32)
     target_link_libraries(opentrack-tracker-rs-impl advapi32)
 
     # for SDK headers
-    if(CMAKE_COMPILER_IS_GNUCC)
+    if(CMAKE_COMPILER_IS_GNUCXX)
         add_definitions(-fpermissive -Wno-error -w
                         #-Wno-missing-field-initializers -Wno-switch -Wno-sign-compare
                         #-Wno-unknown-pragmas -Wno-attributes
diff --git a/tracker-rs/rs_impl/ftnoir_tracker_rs_impl.cpp b/tracker-rs/rs_impl/ftnoir_tracker_rs_impl.cpp
index 41406193..3230ef56 100644
--- a/tracker-rs/rs_impl/ftnoir_tracker_rs_impl.cpp
+++ b/tracker-rs/rs_impl/ftnoir_tracker_rs_impl.cpp
@@ -14,6 +14,8 @@
 #include <pxcfacemodule.h>
 #include <pxcfaceconfiguration.h>
 
+#include <cstdlib>
+
 const size_t kPreviewStreamWidth = 640;
 const size_t kPreviewStreamHeight = 480;
 
diff --git a/tracker-rs/rs_impl/ftnoir_tracker_rs_impl.h b/tracker-rs/rs_impl/ftnoir_tracker_rs_impl.h
index a4c03ce8..c71f30fa 100644
--- a/tracker-rs/rs_impl/ftnoir_tracker_rs_impl.h
+++ b/tracker-rs/rs_impl/ftnoir_tracker_rs_impl.h
@@ -6,15 +6,8 @@
  */
 
 #pragma once
-#ifdef EXPORT_RS_IMPL
-#define RSTRACKERIMPL_VISIBILITY   __declspec( dllexport ) 
-#else
-#define RSTRACKERIMPL_VISIBILITY  
-#endif
 
-extern "C" {                
-    RSTRACKERIMPL_VISIBILITY int rs_tracker_impl_start();
-    RSTRACKERIMPL_VISIBILITY int rs_tracker_impl_update_pose(double *pose);
-    RSTRACKERIMPL_VISIBILITY int rs_tracker_impl_get_preview(void* data, int width, int height);
-    RSTRACKERIMPL_VISIBILITY int rs_tracker_impl_end();
-}
+int rs_tracker_impl_start();
+int rs_tracker_impl_update_pose(double *pose);
+int rs_tracker_impl_get_preview(void* data, int width, int height);
+int rs_tracker_impl_end();