Browse Source

Windows: MSVC2017: adapt more channel plugin modules (1)

chirpmodem-v8.0.0
f4exb 8 years ago
parent
commit
b224e42ef0
  1. 2
      dsdcc/dsdcc.pro
  2. 2
      httpserver/httpserver.pro
  3. 10
      sdrangel.windows.pro
  4. 2
      sdrbase/dsp/basebandsamplesink.h
  5. 2
      sdrbase/dsp/cwkeyer.h
  6. 2
      sdrbase/dsp/upchannelizer.h
  7. 4
      sdrgui/gui/crightclickenabler.h
  8. 4
      sdrgui/gui/levelmeter.h

2
dsdcc/dsdcc.pro

@ -11,10 +11,12 @@ TARGET = dsdcc @@ -11,10 +11,12 @@ TARGET = dsdcc
CONFIG(MINGW32):LIBDSDCCSRC = "C:\softs\dsdcc"
CONFIG(MINGW64):LIBDSDCCSRC = "C:\softs\dsdcc"
CONFIG(MSVC):LIBDSDCCSRC = "C:\softs\dsdcc"
CONFIG(macx):LIBDSDCCSRC = "../../deps/dsdcc"
CONFIG(MINGW32):LIBMBELIBSRC = "C:\softs\mbelib"
CONFIG(MINGW64):LIBMBELIBSRC = "C:\softs\mbelib"
CONFIG(MSVC):LIBMBELIBSRC = "C:\softs\mbelib"
CONFIG(macx):LIBMBELIBSRC = "../../deps/mbelib"
INCLUDEPATH += $$LIBDSDCCSRC

2
httpserver/httpserver.pro

@ -17,6 +17,8 @@ QMAKE_CXXFLAGS += -std=c++11 @@ -17,6 +17,8 @@ QMAKE_CXXFLAGS += -std=c++11
CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug
CONFIG(MSVC):DEFINES += httpserver_EXPORTS
# Enable very detailed debug messages when compiling the debug version
CONFIG(debug, debug|release) {
DEFINES += SUPERVERBOSE

10
sdrangel.windows.pro

@ -15,8 +15,8 @@ SUBDIRS += qrtplib @@ -15,8 +15,8 @@ SUBDIRS += qrtplib
SUBDIRS += swagger
SUBDIRS += sdrbase
SUBDIRS += sdrgui
SUBDIRS += fcdhid
SUBDIRS += fcdlib
CONFIG(!MSVC):SUBDIRS += fcdhid
CONFIG(!MSVC):SUBDIRS += fcdlib
SUBDIRS += libairspy
SUBDIRS += libairspyhf
#SUBDIRS += libbladerf
@ -27,7 +27,7 @@ CONFIG(!MSVC):SUBDIRS += libperseus @@ -27,7 +27,7 @@ CONFIG(!MSVC):SUBDIRS += libperseus
SUBDIRS += librtlsdr
SUBDIRS += devices
SUBDIRS += mbelib
SUBDIRS += dsdcc
CONFIG(!MSVC):SUBDIRS += dsdcc
CONFIG(MSVC):SUBDIRS += cm256cc
SUBDIRS += plugins/samplesource/airspy
SUBDIRS += plugins/samplesource/airspyhf
@ -51,8 +51,8 @@ SUBDIRS += plugins/channelrx/chanalyzer @@ -51,8 +51,8 @@ SUBDIRS += plugins/channelrx/chanalyzer
SUBDIRS += plugins/channelrx/demodam
SUBDIRS += plugins/channelrx/demodatv
SUBDIRS += plugins/channelrx/demodbfm
SUBDIRS += plugins/channelrx/demoddsd
SUBDIRS += plugins/channelrx/demodlora
CONFIG(!MSVC):SUBDIRS += plugins/channelrx/demoddsd
CONFIG(!MSVC):SUBDIRS += plugins/channelrx/demodlora
SUBDIRS += plugins/channelrx/demodnfm
SUBDIRS += plugins/channelrx/demodssb
SUBDIRS += plugins/channelrx/demodwfm

2
sdrbase/dsp/basebandsamplesink.h

@ -30,7 +30,7 @@ class SDRBASE_API BasebandSampleSink : public QObject { @@ -30,7 +30,7 @@ class SDRBASE_API BasebandSampleSink : public QObject {
Q_OBJECT
public:
/** Used to notify on which thread the sample sink is now running (with ThreadedSampleSink) */
class MsgThreadedSink : public Message {
class SDRBASE_API MsgThreadedSink : public Message {
MESSAGE_CLASS_DECLARATION
public:

2
sdrbase/dsp/cwkeyer.h

@ -50,7 +50,7 @@ class SDRBASE_API CWKeyer : public QObject { @@ -50,7 +50,7 @@ class SDRBASE_API CWKeyer : public QObject {
Q_OBJECT
public:
class MsgConfigureCWKeyer : public Message {
class SDRBASE_API MsgConfigureCWKeyer : public Message {
MESSAGE_CLASS_DECLARATION
public:

2
sdrbase/dsp/upchannelizer.h

@ -36,7 +36,7 @@ class MessageQueue; @@ -36,7 +36,7 @@ class MessageQueue;
class SDRBASE_API UpChannelizer : public BasebandSampleSource {
Q_OBJECT
public:
class MsgChannelizerNotification : public Message {
class SDRBASE_API MsgChannelizerNotification : public Message {
MESSAGE_CLASS_DECLARATION
public:

4
sdrgui/gui/crightclickenabler.h

@ -21,7 +21,9 @@ @@ -21,7 +21,9 @@
#include <QAbstractButton>
#include <QMouseEvent>
class CRightClickEnabler : public QObject {
#include "export.h"
class SDRGUI_API CRightClickEnabler : public QObject {
Q_OBJECT
public:
CRightClickEnabler(QAbstractButton *button);

4
sdrgui/gui/levelmeter.h

@ -138,7 +138,7 @@ protected: @@ -138,7 +138,7 @@ protected:
}
};
class LevelMeterVU : public LevelMeter
class SDRGUI_API LevelMeterVU : public LevelMeter
{
public:
LevelMeterVU(QWidget *parent = 0);
@ -148,7 +148,7 @@ protected: @@ -148,7 +148,7 @@ protected:
virtual void resized();
};
class LevelMeterSignalDB : public LevelMeter
class SDRGUI_API LevelMeterSignalDB : public LevelMeter
{
public:
typedef enum

Loading…
Cancel
Save