From 379330d9a547d93539ee672e074c0136d41776ad Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Fri, 15 Sep 2017 18:48:30 +0200
Subject: [PATCH] Fixed sdrbase windows compilation

---
 sdrbase/device/devicesinkapi.cpp   | 4 ++--
 sdrbase/device/devicesinkapi.h     | 2 +-
 sdrbase/device/devicesourceapi.cpp | 4 ++--
 sdrbase/device/devicesourceapi.h   | 2 +-
 sdrbase/dsp/scopevisng.h           | 4 ++++
 sdrbase/sdrbase.pro                | 2 ++
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/sdrbase/device/devicesinkapi.cpp b/sdrbase/device/devicesinkapi.cpp
index 61b14cba1..49082169c 100644
--- a/sdrbase/device/devicesinkapi.cpp
+++ b/sdrbase/device/devicesinkapi.cpp
@@ -173,9 +173,9 @@ void DeviceSinkAPI::setSampleSinkSequence(int sequence)
     m_deviceSinkEngine->setSinkSequence(sequence);
 }
 
-void DeviceSinkAPI::setSampleSinkPluginInterface(PluginInterface *interface)
+void DeviceSinkAPI::setSampleSinkPluginInterface(PluginInterface *iface)
 {
-    m_pluginInterface = interface;
+    m_pluginInterface = iface;
 }
 
 void DeviceSinkAPI::setSampleSinkPluginInstanceUI(PluginInstanceUI *gui)
diff --git a/sdrbase/device/devicesinkapi.h b/sdrbase/device/devicesinkapi.h
index 02dc9e1fb..ce00550b8 100644
--- a/sdrbase/device/devicesinkapi.h
+++ b/sdrbase/device/devicesinkapi.h
@@ -70,7 +70,7 @@ public:
     void setSampleSinkSerial(const QString& serial);
     void setSampleSinkDisplayName(const QString& serial);
     void setSampleSinkSequence(int sequence);
-    void setSampleSinkPluginInterface(PluginInterface *interface);
+    void setSampleSinkPluginInterface(PluginInterface *iface);
     void setSampleSinkPluginInstanceUI(PluginInstanceUI *gui);
 
     const QString& getHardwareId() const { return m_hardwareId; }
diff --git a/sdrbase/device/devicesourceapi.cpp b/sdrbase/device/devicesourceapi.cpp
index 5bce91e7c..c0508afb5 100644
--- a/sdrbase/device/devicesourceapi.cpp
+++ b/sdrbase/device/devicesourceapi.cpp
@@ -174,9 +174,9 @@ void DeviceSourceAPI::setSampleSourceSequence(int sequence)
     m_deviceSourceEngine->setSourceSequence(sequence);
 }
 
-void DeviceSourceAPI::setSampleSourcePluginInterface(PluginInterface *interface)
+void DeviceSourceAPI::setSampleSourcePluginInterface(PluginInterface *iface)
 {
-    m_pluginInterface = interface;
+    m_pluginInterface = iface;
 }
 
 void DeviceSourceAPI::setSampleSourcePluginInstanceGUI(PluginInstanceUI *gui)
diff --git a/sdrbase/device/devicesourceapi.h b/sdrbase/device/devicesourceapi.h
index 0f0714a14..12906665e 100644
--- a/sdrbase/device/devicesourceapi.h
+++ b/sdrbase/device/devicesourceapi.h
@@ -73,7 +73,7 @@ public:
     void setSampleSourceSerial(const QString& serial);
     void setSampleSourceDisplayName(const QString& serial);
     void setSampleSourceSequence(int sequence);
-    void setSampleSourcePluginInterface(PluginInterface *interface);
+    void setSampleSourcePluginInterface(PluginInterface *iface);
     void setSampleSourcePluginInstanceGUI(PluginInstanceUI *gui);
 
     const QString& getHardwareId() const { return m_hardwareId; }
diff --git a/sdrbase/dsp/scopevisng.h b/sdrbase/dsp/scopevisng.h
index 27ef8963e..b47a0cea7 100644
--- a/sdrbase/dsp/scopevisng.h
+++ b/sdrbase/dsp/scopevisng.h
@@ -22,6 +22,7 @@
 #include <QColor>
 #include <algorithm>
 #include <utility>
+#include <math.h>
 
 #include <stdint.h>
 #include <vector>
@@ -32,6 +33,9 @@
 #include "util/message.h"
 #include "util/doublebuffer.h"
 
+#undef M_PI
+#define M_PI		3.14159265358979323846
+
 class GLScopeNG;
 
 class SDRANGEL_API ScopeVisNG : public BasebandSampleSink {
diff --git a/sdrbase/sdrbase.pro b/sdrbase/sdrbase.pro
index e87014761..bed3eb47b 100644
--- a/sdrbase/sdrbase.pro
+++ b/sdrbase/sdrbase.pro
@@ -21,6 +21,8 @@ QMAKE_CXXFLAGS += -msse2
 DEFINES += USE_SSE4_1=1
 QMAKE_CXXFLAGS += -msse4.1
 
+QMAKE_CXXFLAGS += -std=c++11
+
 CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug