Fixed sdrbase windows compilation

pull/85/head
f4exb 2017-09-15 18:48:30 +02:00
rodzic 289fc2a89f
commit 379330d9a5
6 zmienionych plików z 12 dodań i 6 usunięć

Wyświetl plik

@ -173,9 +173,9 @@ void DeviceSinkAPI::setSampleSinkSequence(int sequence)
m_deviceSinkEngine->setSinkSequence(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) void DeviceSinkAPI::setSampleSinkPluginInstanceUI(PluginInstanceUI *gui)

Wyświetl plik

@ -70,7 +70,7 @@ public:
void setSampleSinkSerial(const QString& serial); void setSampleSinkSerial(const QString& serial);
void setSampleSinkDisplayName(const QString& serial); void setSampleSinkDisplayName(const QString& serial);
void setSampleSinkSequence(int sequence); void setSampleSinkSequence(int sequence);
void setSampleSinkPluginInterface(PluginInterface *interface); void setSampleSinkPluginInterface(PluginInterface *iface);
void setSampleSinkPluginInstanceUI(PluginInstanceUI *gui); void setSampleSinkPluginInstanceUI(PluginInstanceUI *gui);
const QString& getHardwareId() const { return m_hardwareId; } const QString& getHardwareId() const { return m_hardwareId; }

Wyświetl plik

@ -174,9 +174,9 @@ void DeviceSourceAPI::setSampleSourceSequence(int sequence)
m_deviceSourceEngine->setSourceSequence(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) void DeviceSourceAPI::setSampleSourcePluginInstanceGUI(PluginInstanceUI *gui)

Wyświetl plik

@ -73,7 +73,7 @@ public:
void setSampleSourceSerial(const QString& serial); void setSampleSourceSerial(const QString& serial);
void setSampleSourceDisplayName(const QString& serial); void setSampleSourceDisplayName(const QString& serial);
void setSampleSourceSequence(int sequence); void setSampleSourceSequence(int sequence);
void setSampleSourcePluginInterface(PluginInterface *interface); void setSampleSourcePluginInterface(PluginInterface *iface);
void setSampleSourcePluginInstanceGUI(PluginInstanceUI *gui); void setSampleSourcePluginInstanceGUI(PluginInstanceUI *gui);
const QString& getHardwareId() const { return m_hardwareId; } const QString& getHardwareId() const { return m_hardwareId; }

Wyświetl plik

@ -22,6 +22,7 @@
#include <QColor> #include <QColor>
#include <algorithm> #include <algorithm>
#include <utility> #include <utility>
#include <math.h>
#include <stdint.h> #include <stdint.h>
#include <vector> #include <vector>
@ -32,6 +33,9 @@
#include "util/message.h" #include "util/message.h"
#include "util/doublebuffer.h" #include "util/doublebuffer.h"
#undef M_PI
#define M_PI 3.14159265358979323846
class GLScopeNG; class GLScopeNG;
class SDRANGEL_API ScopeVisNG : public BasebandSampleSink { class SDRANGEL_API ScopeVisNG : public BasebandSampleSink {

Wyświetl plik

@ -21,6 +21,8 @@ QMAKE_CXXFLAGS += -msse2
DEFINES += USE_SSE4_1=1 DEFINES += USE_SSE4_1=1
QMAKE_CXXFLAGS += -msse4.1 QMAKE_CXXFLAGS += -msse4.1
QMAKE_CXXFLAGS += -std=c++11
CONFIG(Release):build_subdir = release CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug CONFIG(Debug):build_subdir = debug