From 1dc466e60440c8dd3edd823fbee8870efa358c0d Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 13 Nov 2018 16:02:26 +0100 Subject: [PATCH] Windows: MSVC2017: adapt channel analyzer, AM and ATV demods plugin modules --- plugins/channelrx/chanalyzer/chanalyzer.pro | 1 + plugins/channelrx/demodatv/demodatv.pro | 1 + plugins/channelrx/demodbfm/demodbfm.pro | 1 + sdrbase/dsp/downchannelizer.h | 2 +- sdrbase/dsp/interpolator.h | 3 --- sdrgui/gui/tvscreen.h | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/channelrx/chanalyzer/chanalyzer.pro b/plugins/channelrx/chanalyzer/chanalyzer.pro index e2209802a..14377d5b9 100644 --- a/plugins/channelrx/chanalyzer/chanalyzer.pro +++ b/plugins/channelrx/chanalyzer/chanalyzer.pro @@ -25,6 +25,7 @@ INCLUDEPATH += ../../../sdrgui CONFIG(ANDROID):INCLUDEPATH += /opt/softs/boost_1_60_0 CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0" CONFIG(MINGW64):INCLUDEPATH += "C:\softs\boost_1_66_0" +CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0" CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_64_0" CONFIG(Release):build_subdir = release diff --git a/plugins/channelrx/demodatv/demodatv.pro b/plugins/channelrx/demodatv/demodatv.pro index decef5410..aa5fce3d4 100644 --- a/plugins/channelrx/demodatv/demodatv.pro +++ b/plugins/channelrx/demodatv/demodatv.pro @@ -27,6 +27,7 @@ CONFIG(Debug):build_subdir = debug CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0" CONFIG(MINGW64):INCLUDEPATH += "C:\softs\boost_1_66_0" +CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0" CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_64_0" SOURCES += atvdemod.cpp\ diff --git a/plugins/channelrx/demodbfm/demodbfm.pro b/plugins/channelrx/demodbfm/demodbfm.pro index 8f7d6bea1..efb129f79 100644 --- a/plugins/channelrx/demodbfm/demodbfm.pro +++ b/plugins/channelrx/demodbfm/demodbfm.pro @@ -26,6 +26,7 @@ INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client CONFIG(ANDROID):INCLUDEPATH += /opt/softs/boost_1_60_0 CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0" CONFIG(MINGW64):INCLUDEPATH += "C:\softs\boost_1_66_0" +CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0" CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_64_0" CONFIG(Release):build_subdir = release diff --git a/sdrbase/dsp/downchannelizer.h b/sdrbase/dsp/downchannelizer.h index 3e5059154..d67f3b4de 100644 --- a/sdrbase/dsp/downchannelizer.h +++ b/sdrbase/dsp/downchannelizer.h @@ -32,7 +32,7 @@ class MessageQueue; class SDRBASE_API DownChannelizer : public BasebandSampleSink { Q_OBJECT public: - class MsgChannelizerNotification : public Message { + class SDRBASE_API MsgChannelizerNotification : public Message { MESSAGE_CLASS_DECLARATION public: diff --git a/sdrbase/dsp/interpolator.h b/sdrbase/dsp/interpolator.h index 607b3fe97..07d5171d0 100644 --- a/sdrbase/dsp/interpolator.h +++ b/sdrbase/dsp/interpolator.h @@ -7,9 +7,6 @@ #include "dsp/dsptypes.h" #include "export.h" #include -#ifndef __WINDOWS__ -#include -#endif class SDRBASE_API Interpolator { public: diff --git a/sdrgui/gui/tvscreen.h b/sdrgui/gui/tvscreen.h index 45587ec8e..756636aed 100644 --- a/sdrgui/gui/tvscreen.h +++ b/sdrgui/gui/tvscreen.h @@ -35,7 +35,7 @@ class QPainter; -class TVScreen: public QGLWidget +class SDRGUI_API TVScreen: public QGLWidget { Q_OBJECT