Adapt to MSVC linker

devices/bladerf/devicebladerf.h

@@ -19,7 +19,9 @@
 
 #include <libbladeRF.h>
 
-class DeviceBladeRF
+#include "util/export.h"
+
+class DEVICES_API DeviceBladeRF
 {
 public:
     static bool open_bladerf(struct bladerf **dev, const char *serial);

devices/bladerf/devicebladerfshared.h

@@ -18,8 +18,9 @@
 #define DEVICES_BLADERF_DEVICEHACKRFSHARED_H_
 
 #include "util/message.h"
+#include "util/export.h"
 
-class DeviceBladeRFShared
+class DEVICES_API DeviceBladeRFShared
 {
 public:
     static const float  m_sampleFifoLengthInSeconds;

devices/bladerf/devicebladerfvalues.h

@@ -17,8 +17,9 @@
 #ifndef DEVICES_BLADERF_DEVICEBLADERFVALUES_H_
 #define DEVICES_BLADERF_DEVICEBLADERFVALUES_H_
 
+#include "util/export.h"
 
-class DeviceBladeRFBandwidths {
+class DEVICES_API DeviceBladeRFBandwidths {
 public:
     static unsigned int getBandwidth(unsigned int bandwidth_index);
     static unsigned int getBandwidthIndex(unsigned int bandwidth);

devices/hackrf/devicehackrf.h

@@ -19,7 +19,9 @@
 
 #include "libhackrf/hackrf.h"
 
-class DeviceHackRF
+#include "util/export.h"
+
+class DEVICES_API DeviceHackRF
 {
 public:
     static DeviceHackRF& instance();

devices/hackrf/devicehackrfshared.h

@@ -18,8 +18,9 @@
 #define DEVICES_HACKRF_DEVICEHACKRFSHARED_H_
 
 #include "util/message.h"
+#include "util/export.h"
 
-class DeviceHackRFShared
+class DEVICES_API DeviceHackRFShared
 {
 public:
     class MsgConfigureFrequencyDelta : public Message

devices/hackrf/devicehackrfvalues.h

@@ -17,7 +17,9 @@
 #ifndef DEVICES_HACKRF_DEVICEHACKRFVALUES_H_
 #define DEVICES_HACKRF_DEVICEHACKRFVALUES_H_
 
-class HackRFBandwidths {
+#include "util/export.h"
+
+class DEVICES_API HackRFBandwidths {
 public:
     static unsigned int getBandwidth(unsigned int bandwidth_index);
     static unsigned int getBandwidthIndex(unsigned int bandwidth);

devices/limesdr/devicelimesdr.h

@@ -19,7 +19,9 @@
 
 #include "lime/LimeSuite.h"
 
-class DeviceLimeSDR
+#include "util/export.h"
+
+class DEVICES_API DeviceLimeSDR
 {
 public:
     enum PathRxRFE

devices/limesdr/devicelimesdrparam.h

@@ -19,6 +19,8 @@
 
 #include "lime/LimeSuite.h"
 
+#include "util/export.h"
+
 /**
  * This structure refers to one physical device shared among parties (logical devices represented by
  * the DeviceSinkAPI or DeviceSourceAPI).
@@ -26,7 +28,7 @@
  * There is only one copy that is constructed by the first participant and destroyed by the last.
  * A participant knows it is the first or last by checking the lists of buddies (Rx + Tx).
  */
-struct DeviceLimeSDRParams
+struct DEVICES_API DeviceLimeSDRParams
 {
     lms_device_t *m_dev;         //!< device handle
     uint32_t     m_nbRxChannels; //!< number of Rx channels (normally 2, we'll see if we really use it...)

devices/limesdr/devicelimesdrshared.h

@@ -20,11 +20,12 @@
 #include <cstddef>
 #include "devicelimesdrparam.h"
 #include "util/message.h"
+#include "util/export.h"
 
 /**
  * Structure shared by a buddy with other buddies
  */
-class DeviceLimeSDRShared
+class DEVICES_API DeviceLimeSDRShared
 {
 public:
     class MsgReportBuddyChange : public Message {

devices/perseus/deviceperseus.h

@@ -19,7 +19,9 @@
 
 #include "deviceperseusscan.h"
 
-class DevicePerseus
+#include "util/export.h"
+
+class DEVICES_API DevicePerseus
 {
 public:
     static DevicePerseus& instance();

devices/perseus/deviceperseusscan.h

@@ -23,8 +23,9 @@
 #include <map>
 #include <QString>
 
+#include "util/export.h"
 
-class DevicePerseusScan
+class DEVICES_API DevicePerseusScan
 {
 public:
     struct DeviceScan

devices/plutosdr/deviceplutosdr.h

@@ -22,7 +22,9 @@
 #include "deviceplutosdrscan.h"
 #include "deviceplutosdrbox.h"
 
-class DevicePlutoSDR
+#include "util/export.h"
+
+class DEVICES_API DevicePlutoSDR
 {
 public:
     static DevicePlutoSDR& instance();

devices/plutosdr/deviceplutosdrbox.h

@@ -22,7 +22,9 @@
 #include <sys/types.h>
 #include "deviceplutosdrscan.h"
 
-class DevicePlutoSDRBox
+#include "util/export.h"
+
+class DEVICES_API DevicePlutoSDRBox
 {
 public:
     typedef enum

devices/plutosdr/deviceplutosdrparams.h

@@ -19,7 +19,9 @@
 
 #include <string>
 
-class DevicePlutoSDRBox;
+#include "util/export.h"
+
+class DEVICES_API DevicePlutoSDRBox;
 
 /**
  * This structure refers to one physical device shared among parties (logical devices represented by

devices/plutosdr/deviceplutosdrscan.h

@@ -21,7 +21,9 @@
 #include <vector>
 #include <map>
 
-class DevicePlutoSDRScan
+#include "util/export.h"
+
+class DEVICES_API DevicePlutoSDRScan
 {
 public:
     struct DeviceScan

devices/plutosdr/deviceplutosdrshared.h

@@ -20,13 +20,14 @@
 #include <stdint.h>
 
 #include "util/message.h"
+#include "util/export.h"
 
 class DevicePlutoSDRParams;
 
 /**
  * Structure shared by a buddy with other buddies
  */
-class DevicePlutoSDRShared
+class DEVICES_API DevicePlutoSDRShared
 {
 public:
     /**

httpserver/CMakeLists.txt

@@ -33,6 +33,7 @@ set(httpserver_HEADERS
 
 include_directories(
 	.
+    ${CMAKE_SOURCE_DIR}/sdrbase	
 	${CMAKE_CURRENT_BINARY_DIR}
 )
 

httpserver/httpconnectionhandler.h

@@ -18,6 +18,8 @@
 #include "httprequesthandler.h"
 #include "httplistenersettings.h"
 
+#include "util/export.h"
+
 namespace qtwebapp {
 
 /** Alias type definition, for compatibility to different Qt versions */
@@ -47,7 +49,7 @@ namespace qtwebapp {
   The readTimeout value defines the maximum time to wait for a complete HTTP request.
   @see HttpRequest for description of config settings maxRequestSize and maxMultiPartSize.
 */
-class DECLSPEC HttpConnectionHandler : public QThread {
+class HTTPSERVER_API HttpConnectionHandler : public QThread {
     Q_OBJECT
     Q_DISABLE_COPY(HttpConnectionHandler)
 

httpserver/httpconnectionhandlerpool.h

@@ -9,6 +9,8 @@
 #include "httpconnectionhandler.h"
 #include "httplistenersettings.h"
 
+#include "util/export.h"
+
 namespace qtwebapp {
 
 /**
@@ -46,7 +48,7 @@ namespace qtwebapp {
   @see HttpRequest for description of config settings maxRequestSize and maxMultiPartSize
 */
 
-class DECLSPEC HttpConnectionHandlerPool : public QObject {
+class HTTPSERVER_API HttpConnectionHandlerPool : public QObject {
     Q_OBJECT
     Q_DISABLE_COPY(HttpConnectionHandlerPool)
 public:

httpserver/httpcookie.h

@@ -10,6 +10,8 @@
 #include <QByteArray>
 #include "httpglobal.h"
 
+#include "util/export.h"
+
 namespace qtwebapp {
 
 /**
@@ -18,7 +20,7 @@ namespace qtwebapp {
   2109.
 */
 
-class DECLSPEC HttpCookie
+class HTTPSERVER_API HttpCookie
 {
 public:
 

httpserver/httplistener.h

@@ -15,6 +15,8 @@
 #include "httprequesthandler.h"
 #include "httplistenersettings.h"
 
+#include "util/export.h"
+
 namespace qtwebapp {
 
 /**
@@ -42,7 +44,7 @@ namespace qtwebapp {
   @see HttpRequest for description of config settings maxRequestSize and maxMultiPartSize
 */
 
-class DECLSPEC HttpListener : public QTcpServer {
+class HTTPSERVER_API HttpListener : public QTcpServer {
     Q_OBJECT
     Q_DISABLE_COPY(HttpListener)
 public:

httpserver/httprequest.h

@@ -17,6 +17,8 @@
 #include "httpglobal.h"
 #include "httplistenersettings.h"
 
+#include "util/export.h"
+
 namespace qtwebapp {
 
 /**
@@ -36,7 +38,7 @@ namespace qtwebapp {
   The body is always a little larger than the file itself.
 */
 
-class DECLSPEC HttpRequest {
+class HTTPSERVER_API HttpRequest {
     Q_DISABLE_COPY(HttpRequest)
     friend class HttpSessionStore;
 

httpserver/httprequesthandler.h

@@ -10,6 +10,8 @@
 #include "httprequest.h"
 #include "httpresponse.h"
 
+#include "util/export.h"
+
 namespace qtwebapp {
 
 /**
@@ -24,7 +26,7 @@ namespace qtwebapp {
    @see StaticFileController which delivers static local files.
 */
 
-class DECLSPEC HttpRequestHandler : public QObject {
+class HTTPSERVER_API HttpRequestHandler : public QObject {
     Q_OBJECT
     Q_DISABLE_COPY(HttpRequestHandler)
 public:

httpserver/httpresponse.h

@@ -12,6 +12,8 @@
 #include "httpglobal.h"
 #include "httpcookie.h"
 
+#include "util/export.h"
+
 namespace qtwebapp {
 
 /**
@@ -33,7 +35,7 @@ namespace qtwebapp {
   before calling write(). Web Browsers use that information to display a progress bar.
 */
 
-class DECLSPEC HttpResponse {
+class HTTPSERVER_API HttpResponse {
     Q_DISABLE_COPY(HttpResponse)
 public:
 

httpserver/httpsession.h

@@ -11,6 +11,8 @@
 #include <QReadWriteLock>
 #include "httpglobal.h"
 
+#include "util/export.h"
+
 namespace qtwebapp {
 
 /**
@@ -20,7 +22,7 @@ namespace qtwebapp {
   @see HttpSessionStore should be used to create and get instances of this class.
 */
 
-class DECLSPEC HttpSession {
+class HTTPSERVER_API HttpSession {
 
 public:
 

httpserver/httpsessionstore.h

@@ -16,6 +16,8 @@
 #include "httprequest.h"
 #include "httpsessionssettings.h"
 
+#include "util/export.h"
+
 namespace qtwebapp {
 
 /**
@@ -33,7 +35,7 @@ namespace qtwebapp {
   </pre></code>
 */
 
-class DECLSPEC HttpSessionStore : public QObject {
+class HTTPSERVER_API HttpSessionStore : public QObject {
     Q_OBJECT
     Q_DISABLE_COPY(HttpSessionStore)
 public:

httpserver/staticfilecontroller.h

@@ -13,6 +13,8 @@
 #include "httpresponse.h"
 #include "httprequesthandler.h"
 
+#include "util/export.h"
+
 namespace qtwebapp {
 
 /**
@@ -44,7 +46,7 @@ namespace qtwebapp {
 
 class HttpDocrootSettings;
 
-class DECLSPEC StaticFileController : public HttpRequestHandler  {
+class HTTPSERVER_API StaticFileController : public HttpRequestHandler  {
     Q_OBJECT
     Q_DISABLE_COPY(StaticFileController)
 public:

logging/CMakeLists.txt

@@ -19,6 +19,7 @@ set(httpserver_HEADERS
 
 include_directories(
 	.
+    ${CMAKE_SOURCE_DIR}/sdrbase 
 	${CMAKE_CURRENT_BINARY_DIR}
 )
 

logging/dualfilelogger.h

@@ -13,6 +13,8 @@
 #include "logger.h"
 #include "filelogger.h"
 
+#include "util/export.h"
+
 namespace qtwebapp {
 
 /**
@@ -21,7 +23,7 @@ namespace qtwebapp {
   @see FileLogger for a description of the two underlying loggers.
 */
 
-class DECLSPEC DualFileLogger : public Logger {
+class LOGGING_API DualFileLogger : public Logger {
     Q_OBJECT
     Q_DISABLE_COPY(DualFileLogger)
 public:

logging/filelogger.h

@@ -15,6 +15,8 @@
 #include "logger.h"
 #include "fileloggersettings.h"
 
+#include "util/export.h"
+
 namespace qtwebapp {
 
 /**
@@ -49,7 +51,7 @@ namespace qtwebapp {
   @see Logger for a descrition of the buffer.
 */
 
-class DECLSPEC FileLogger : public Logger {
+class LOGGING_API FileLogger : public Logger {
     Q_OBJECT
     Q_DISABLE_COPY(FileLogger)
 public:

logging/logger.h

@@ -15,6 +15,8 @@
 #include "logglobal.h"
 #include "logmessage.h"
 
+#include "util/export.h"
+
 namespace qtwebapp {
 
 /**
@@ -47,7 +49,7 @@ namespace qtwebapp {
   because logging to the console is less useful.
 */
 
-class DECLSPEC Logger : public QObject {
+class LOGGING_API Logger : public QObject {
     Q_OBJECT
     Q_DISABLE_COPY(Logger)
 public:

logging/loggerwithfile.h

@@ -12,6 +12,8 @@
 #include "logger.h"
 #include "filelogger.h"
 
+#include "util/export.h"
+
 namespace qtwebapp {
 
 /**
@@ -20,7 +22,7 @@ namespace qtwebapp {
   @see Logger for a description of the console loger.
 */
 
-class DECLSPEC LoggerWithFile : public Logger {
+class LOGGING_API LoggerWithFile : public Logger {
     Q_OBJECT
     Q_DISABLE_COPY(LoggerWithFile)
 

logging/logmessage.h

@@ -11,6 +11,8 @@
 #include <QHash>
 #include "logglobal.h"
 
+#include "util/export.h"
+
 namespace qtwebapp {
 
 /**
@@ -33,7 +35,7 @@ namespace qtwebapp {
   - {line}      Line number where the message was generated
 */
 
-class DECLSPEC LogMessage
+class LOGGING_API LogMessage
 {
     Q_DISABLE_COPY(LogMessage)
 public:

qrtplib/CMakeLists.txt

@@ -92,6 +92,7 @@ set(qrtplib_SOURCES
 
 include_directories(
     .
+    ${CMAKE_SOURCE_DIR}/sdrbase 
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 

qrtplib/rtcpapppacket.h

@@ -43,13 +43,15 @@
 #include "rtpstructs.h"
 #include "rtpendian.h"
 
+#include "util/export.h"
+
 namespace qrtplib
 {
 
 class RTCPCompoundPacket;
 
 /** Describes an RTCP APP packet. */
-class RTCPAPPPacket: public RTCPPacket
+class QRTPLIB_API RTCPAPPPacket: public RTCPPacket
 {
 public:
     /** Creates an instance based on the data in \c data with length \c datalen.

qrtplib/rtcpbyepacket.h

@@ -43,13 +43,15 @@
 #include "rtpstructs.h"
 #include "rtpendian.h"
 
+#include "util/export.h"
+
 namespace qrtplib
 {
 
 class RTCPCompoundPacket;
 
 /** Describes an RTCP BYE packet. */
-class RTCPBYEPacket: public RTCPPacket
+class QRTPLIB_API RTCPBYEPacket: public RTCPPacket
 {
 public:
     /** Creates an instance based on the data in \c data with length \c datalen.

qrtplib/rtcpcompoundpacket.h

@@ -43,6 +43,8 @@
 #include "rtpendian.h"
 #include <list>
 
+#include "util/export.h"
+
 namespace qrtplib
 {
 
@@ -50,7 +52,7 @@ class RTPRawPacket;
 class RTCPPacket;
 
 /** Represents an RTCP compound packet. */
-class RTCPCompoundPacket
+class QRTPLIB_API RTCPCompoundPacket
 {
 public:
     /** Creates an RTCPCompoundPacket instance from the data in \c rawpack, installing a memory manager if specified. */

qrtplib/rtcpcompoundpacketbuilder.h

@@ -46,6 +46,8 @@
 #include "rtpendian.h"
 #include <list>
 
+#include "util/export.h"
+
 namespace qrtplib
 {
 
@@ -55,7 +57,7 @@ namespace qrtplib
  *  been built successfully. The member functions described below return \c ERR_RTP_RTCPCOMPPACKBUILDER_NOTENOUGHBYTESLEFT
  *  if the action would cause the maximum allowed size to be exceeded.
  */
-class RTCPCompoundPacketBuilder: public RTCPCompoundPacket
+class QRTPLIB_API RTCPCompoundPacketBuilder: public RTCPCompoundPacket
 {
 public:
     /** Constructs an RTCPCompoundPacketBuilder instance, optionally installing a memory manager. */

qrtplib/rtcppacketbuilder.h

@@ -44,6 +44,8 @@
 #include "rtcpsdesinfo.h"
 #include "rtptimeutilities.h"
 
+#include "util/export.h"
+
 namespace qrtplib
 {
 
@@ -59,7 +61,7 @@ class RTCPCompoundPacketBuilder;
  *  an RTPSources instance to automatically generate the next compound packet which should be sent. It also
  *  provides functions to determine when SDES items other than the CNAME item should be sent.
  */
-class RTCPPacketBuilder
+class QRTPLIB_API RTCPPacketBuilder
 {
 public:
     /** Creates an RTCPPacketBuilder instance.

qrtplib/rtcprrpacket.h

@@ -43,13 +43,15 @@
 #include "rtpstructs.h"
 #include "rtpendian.h"
 
+#include "util/export.h"
+
 namespace qrtplib
 {
 
 class RTCPCompoundPacket;
 
 /** Describes an RTCP receiver report packet. */
-class RTCPRRPacket: public RTCPPacket
+class QRTPLIB_API RTCPRRPacket: public RTCPPacket
 {
 public:
     /** Creates an instance based on the data in \c data with length \c datalen.

qrtplib/rtcpscheduler.h

@@ -43,6 +43,8 @@
 #include "rtprandom.h"
 #include <cstddef>
 
+#include "util/export.h"
+
 namespace qrtplib
 {
 
@@ -51,7 +53,7 @@ class RTPPacket;
 class RTPSources;
 
 /** Describes parameters used by the RTCPScheduler class. */
-class RTCPSchedulerParams
+class QRTPLIB_API RTCPSchedulerParams
 {
 public:
     RTCPSchedulerParams();

qrtplib/rtcpsdesinfo.h

@@ -45,11 +45,13 @@
 #include <string.h>
 #include <list>
 
+#include "util/export.h"
+
 namespace qrtplib
 {
 
 /** The class RTCPSDESInfo is a container for RTCP SDES information. */
-class RTCPSDESInfo
+class QRTPLIB_API RTCPSDESInfo
 {
 public:
     /** Constructs an instance, optionally installing a memory manager. */

qrtplib/rtcpsdespacket.h

@@ -44,13 +44,15 @@
 #include "rtpdefines.h"
 #include "rtpendian.h"
 
+#include "util/export.h"
+
 namespace qrtplib
 {
 
 class RTCPCompoundPacket;
 
 /** Describes an RTCP source description packet. */
-class RTCPSDESPacket: public RTCPPacket
+class QRTPLIB_API RTCPSDESPacket: public RTCPPacket
 {
 public:
     /** Identifies the type of an SDES item. */

qrtplib/rtcpsrpacket.h

@@ -44,13 +44,15 @@
 #include "rtpstructs.h"
 #include "rtpendian.h"
 
+#include "util/export.h"
+
 namespace qrtplib
 {
 
 class RTCPCompoundPacket;
 
 /** Describes an RTCP sender report packet. */
-class RTCPSRPacket: public RTCPPacket
+class QRTPLIB_API RTCPSRPacket: public RTCPPacket
 {
 public:
     /** Creates an instance based on the data in \c data with length \c datalen.

qrtplib/rtpabortdescriptors.h

@@ -41,6 +41,8 @@
 #include "rtpconfig.h"
 #include "rtpsocketutil.h"
 
+#include "util/export.h"
+
 namespace qrtplib
 {
 
@@ -61,7 +63,7 @@ namespace qrtplib
  * uses a single poll thread for several RTPSession and RTPTransmitter instances.
  * This idea is further illustrated in `example8.cpp`.
  */
-class RTPAbortDescriptors
+class QRTPLIB_API RTPAbortDescriptors
 {
 public:
     RTPAbortDescriptors();

qrtplib/rtpaddress.h

@@ -43,11 +43,13 @@
 #include <stdint.h>
 #include <QHostAddress>
 
+#include "util/export.h"
+
 namespace qrtplib
 {
 
 /** This class is an abstract class which is used to specify destinations, multicast groups etc. */
-class RTPAddress
+class QRTPLIB_API RTPAddress
 {
 public:
     /** Returns the type of address the actual implementation represents. */

qrtplib/rtpcollisionlist.h

@@ -43,13 +43,15 @@
 #include "rtptimeutilities.h"
 #include <list>
 
+#include "util/export.h"
+
 namespace qrtplib
 {
 
 class RTPAddress;
 
 /** This class represents a list of addresses from which SSRC collisions were detected. */
-class RTPCollisionList
+class QRTPLIB_API RTPCollisionList
 {
 public:
     /** Constructs an instance, optionally installing a memory manager. */

qrtplib/rtpexternaltransmitter.h

@@ -43,6 +43,8 @@
 #include "rtpabortdescriptors.h"
 #include <list>
 
+#include "util/export.h"
+
 namespace qrtplib
 {
 
@@ -56,7 +58,7 @@ class RTPExternalTransmitter;
  *  so that the transmitter will call the \c SendRTP, \c SendRTCP and \c ComesFromThisSender
  *  methods of this instance when needed.
  */
-class RTPExternalSender
+class QRTPLIB_API RTPExternalSender
 {
 public:
     RTPExternalSender()

qrtplib/rtpinternalsourcedata.h

@@ -44,10 +44,12 @@
 #include "rtptimeutilities.h"
 #include "rtpsources.h"
 
+#include "util/export.h"
+
 namespace qrtplib
 {
 
-class RTPInternalSourceData: public RTPSourceData
+class QRTPLIB_API RTPInternalSourceData: public RTPSourceData
 {
 public:
     RTPInternalSourceData(uint32_t ssrc);

qrtplib/rtpipv4address.h

@@ -42,6 +42,8 @@
 #include "rtpaddress.h"
 #include "rtptypes.h"
 
+#include "util/export.h"
+
 namespace qrtplib
 {
 
@@ -51,7 +53,7 @@ namespace qrtplib
  *  number is ignored. When an instance is used in one of the accept or ignore functions of the
  *  transmitter, a zero port number represents all ports for the specified IP address.
  */
-class RTPIPv4Address: public RTPAddress
+class QRTPLIB_API RTPIPv4Address: public RTPAddress
 {
 public:
     /** Creates an instance with IP address \c ip and port number \c port (both

qrtplib/rtpipv4destination.h

@@ -49,10 +49,12 @@
 #include <string.h>
 #include <string>
 
+#include "util/export.h"
+
 namespace qrtplib
 {
 
-class RTPIPv4Destination
+class QRTPLIB_API RTPIPv4Destination
 {
 public:
     RTPIPv4Destination()

qrtplib/rtplibraryversion.h

@@ -42,13 +42,15 @@
 #include <string>
 #include <stdio.h>
 
+#include "util/export.h"
+
 namespace qrtplib
 {
 
 /**
  * Used to provide information about the version of the library.
  */
-class RTPLibraryVersion
+class QRTPLIB_API RTPLibraryVersion
 {
 public:
     /** Returns an instance of RTPLibraryVersion describing the version of the library. */

qrtplib/rtppacketbuilder.h

@@ -45,6 +45,8 @@
 #include "rtptimeutilities.h"
 #include "rtptypes.h"
 
+#include "util/export.h"
+
 namespace qrtplib
 {
 
@@ -53,7 +55,7 @@ class RTPSources;
 /** This class can be used to build RTP packets and is a bit more high-level than the RTPPacket
  *  class: it generates an SSRC identifier, keeps track of timestamp and sequence number etc.
  */
-class RTPPacketBuilder
+class QRTPLIB_API RTPPacketBuilder
 {
 public:
     /** Constructs an instance which will use \c rtprand for generating random numbers

qrtplib/rtprandom.h

@@ -42,13 +42,15 @@
 #include "rtptypes.h"
 #include <stdlib.h>
 
+#include "util/export.h"
+
 #define RTPRANDOM_2POWMIN63										1.08420217248550443400745280086994171142578125e-19
 
 namespace qrtplib
 {
 
 /** Interface for generating random numbers. */
-class RTPRandom
+class QRTPLIB_API RTPRandom
 {
 public:
     RTPRandom()

qrtplib/rtprandomrand48.h

@@ -42,11 +42,13 @@
 #include "rtprandom.h"
 #include <stdio.h>
 
+#include "util/export.h"
+
 namespace qrtplib
 {
 
 /** A random number generator using the algorithm of the rand48 set of functions. */
-class RTPRandomRand48: public RTPRandom
+class QRTPLIB_API RTPRandomRand48: public RTPRandom
 {
 public:
     RTPRandomRand48();

qrtplib/rtprandomrands.h

@@ -41,13 +41,15 @@
 #include "rtpconfig.h"
 #include "rtprandom.h"
 
+#include "util/export.h"
+
 namespace qrtplib
 {
 
 /** A random number generator which tries to use the \c rand_s function on the
  *  Win32 platform.
  */
-class RTPRandomRandS: public RTPRandom
+class QRTPLIB_API RTPRandomRandS: public RTPRandom
 {
 public:
     RTPRandomRandS();

qrtplib/rtprandomurandom.h

@@ -42,11 +42,13 @@
 #include "rtprandom.h"
 #include <stdio.h>
 
+#include "util/export.h"
+
 namespace qrtplib
 {
 
 /** A random number generator which uses bytes delivered by the /dev/urandom device. */
-class RTPRandomURandom: public RTPRandom
+class QRTPLIB_API RTPRandomURandom: public RTPRandom
 {
 public:
     RTPRandomURandom();

qrtplib/rtpsession.h

@@ -50,6 +50,8 @@
 #include "rtcpcompoundpacketbuilder.h"
 #include <list>
 
+#include "util/export.h"
+
 namespace qrtplib
 {
 
@@ -72,7 +74,7 @@ class RTCPAPPPacket;
  *  \note The RTPSession class is not meant to be thread safe. The user should use some kind of locking
  *        mechanism to prevent different threads from using the same RTPSession instance.
  */
-class RTPSession
+class QRTPLIB_API RTPSession
 {
 public:
     /** Constructs an RTPSession instance, optionally using a specific instance of a random

qrtplib/rtpsessionparams.h

@@ -44,6 +44,8 @@
 #include "rtptimeutilities.h"
 #include "rtpsources.h"
 
+#include "util/export.h"
+
 namespace qrtplib
 {
 
@@ -51,7 +53,7 @@ namespace qrtplib
  *  Describes the parameters for to be used by an RTPSession instance. Note that the own timestamp
  *  unit must be set to a valid number, otherwise the session can't be created.
  */
-class RTPSessionParams
+class QRTPLIB_API RTPSessionParams
 {
 public:
     RTPSessionParams();

qrtplib/rtpsessionsources.h

@@ -41,12 +41,14 @@
 #include "rtpconfig.h"
 #include "rtpsources.h"
 
+#include "util/export.h"
+
 namespace qrtplib
 {
 
 class RTPSession;
 
-class RTPSessionSources: public RTPSources
+class QRTPLIB_API RTPSessionSources: public RTPSources
 {
 public:
     RTPSessionSources(RTPSession &sess) :

qrtplib/rtpsourcedata.h

@@ -46,12 +46,14 @@
 #include "rtpsources.h"
 #include <list>
 
+#include "util/export.h"
+
 namespace qrtplib
 {
 
 class RTPAddress;
 
-class RTCPSenderReportInfo
+class QRTPLIB_API RTCPSenderReportInfo
 {
 public:
     RTCPSenderReportInfo() :

qrtplib/rtpsources.h

@@ -43,12 +43,14 @@
 #include "rtcpsdespacket.h"
 #include "rtptypes.h"
 
+#include "util/export.h"
+
 #define RTPSOURCES_HASHSIZE							8317
 
 namespace qrtplib
 {
 
-class RTPSources_GetHashIndex
+class QRTPLIB_API RTPSources_GetHashIndex
 {
 public:
     static int GetIndex(const uint32_t &ssrc)
@@ -73,7 +75,7 @@ class RTPSourceData;
  *  is used to identify packets from our own session. The class also provides some overridable functions
  *  which can be used to catch certain events (new SSRC, SSRC collision, ...).
  */
-class RTPSources
+class QRTPLIB_API RTPSources
 {
 public:
     /** Type of probation to use for new sources. */

qrtplib/rtptcpaddress.h

@@ -43,6 +43,8 @@
 #include "rtptypes.h"
 #include "rtpsocketutil.h"
 
+#include "util/export.h"
+
 namespace qrtplib
 {
 /** Represents a TCP 'address' and port.
@@ -50,7 +52,7 @@ namespace qrtplib
  *  should be used to send/receive data, and to know on which socket incoming data
  *  was received.
  */
-class RTPTCPAddress: public RTPAddress
+class QRTPLIB_API RTPTCPAddress: public RTPAddress
 {
 public:
     /** Creates an instance with which you can use a specific socket

qrtplib/rtptcptransmitter.h

@@ -46,11 +46,13 @@
 #include <list>
 #include <vector>
 
+#include "util/export.h"
+
 namespace qrtplib
 {
 
 /** Parameters for the TCP transmitter. */
-class RTPTCPTransmissionParams: public RTPTransmissionParams
+class QRTPLIB_API RTPTCPTransmissionParams: public RTPTransmissionParams
 {
 public:
     RTPTCPTransmissionParams();

qrtplib/rtptimeutilities.h

@@ -46,6 +46,8 @@
 #include <errno.h>
 #endif // RTP_HAVE_QUERYPERFORMANCECOUNTER
 
+#include "util/export.h"
+
 #define RTP_NTPTIMEOFFSET									2208988800UL
 
 #ifdef RTP_HAVE_VSUINT64SUFFIX
@@ -63,7 +65,7 @@ namespace qrtplib
  * This is a simple wrapper for the most significant word (MSW) and least
  * significant word (LSW) of an NTP timestamp.
  */
-class RTPNTPTime
+class QRTPLIB_API RTPNTPTime
 {
 public:
     /** This constructor creates and instance with MSW \c m and LSW \c l. */
@@ -92,7 +94,7 @@ private:
  *  This class is used to specify wallclock time, delay intervals etc.
  *  It stores a number of seconds and a number of microseconds.
  */
-class RTPTime
+class QRTPLIB_API RTPTime
 {
 public:
     /** Returns an RTPTime instance representing the current wallclock time.
@@ -392,7 +394,7 @@ inline bool RTPTime::operator>=(const RTPTime &t) const
     return m_t >= t.m_t;
 }
 
-class RTPTimeInitializerObject
+class QRTPLIB_API RTPTimeInitializerObject
 {
 public:
     RTPTimeInitializerObject();
@@ -404,7 +406,7 @@ private:
     int dummy;
 };
 
-extern RTPTimeInitializerObject timeinit;
+extern QRTPLIB_API RTPTimeInitializerObject timeinit;
 
 } // end namespace
 

qrtplib/rtpudptransmitter.h

@@ -38,6 +38,8 @@
 #include <stdint.h>
 #include <list>
 
+#include "util/export.h"
+
 #define RTPUDPV4TRANS_HASHSIZE                                  8317
 #define RTPUDPV4TRANS_DEFAULTPORTBASE                           5000
 #define RTPUDPV4TRANS_RTPRECEIVEBUFFER                          32768
@@ -51,7 +53,7 @@ namespace qrtplib
 {
 
 /** Parameters for the UDP transmitter. */
-class RTPUDPTransmissionParams: public RTPTransmissionParams
+class QRTPLIB_API RTPUDPTransmissionParams: public RTPTransmissionParams
 {
 public:
     RTPUDPTransmissionParams();
@@ -253,7 +255,7 @@ inline RTPUDPTransmissionParams::RTPUDPTransmissionParams() :
 }
 
 /** Additional information about the UDP over IPv4 transmitter. */
-class RTPUDPTransmissionInfo: public RTPTransmissionInfo
+class QRTPLIB_API RTPUDPTransmissionInfo: public RTPTransmissionInfo
 {
 public:
     RTPUDPTransmissionInfo(const std::list<QHostAddress>& iplist, QUdpSocket *rtpsock, QUdpSocket *rtcpsock, uint16_t rtpport, uint16_t rtcpport) :
@@ -313,7 +315,7 @@ private:
  *  are described by the class RTPUDPTransmissionParams. The GetTransmissionInfo member function
  *  returns an instance of type RTPUDPTransmissionInfo.
  */
-class RTPUDPTransmitter: public RTPTransmitter
+class QRTPLIB_API RTPUDPTransmitter: public RTPTransmitter
 {
 public:
     RTPUDPTransmitter();

qrtplib/rtpudpv4transmitter.h

@@ -47,6 +47,8 @@
 #include "rtpabortdescriptors.h"
 #include <list>
 
+#include "util/export.h"
+
 #define RTPUDPV4TRANS_HASHSIZE									8317
 #define RTPUDPV4TRANS_DEFAULTPORTBASE								5000
 
@@ -59,7 +61,7 @@ namespace qrtplib
 {
 
 /** Parameters for the UDP over IPv4 transmitter. */
-class RTPUDPv4TransmissionParams: public RTPTransmissionParams
+class QRTPLIB_API RTPUDPv4TransmissionParams: public RTPTransmissionParams
 {
 public:
     RTPUDPv4TransmissionParams();
@@ -294,7 +296,7 @@ inline RTPUDPv4TransmissionParams::RTPUDPv4TransmissionParams() :
 }
 
 /** Additional information about the UDP over IPv4 transmitter. */
-class RTPUDPv4TransmissionInfo: public RTPTransmissionInfo
+class QRTPLIB_API RTPUDPv4TransmissionInfo: public RTPTransmissionInfo
 {
 public:
     RTPUDPv4TransmissionInfo(std::list<uint32_t> iplist, SocketType rtpsock, SocketType rtcpsock, uint16_t rtpport, uint16_t rtcpport) :
@@ -373,7 +375,7 @@ public:
  *  argument require an argument of RTPIPv4Address. The GetTransmissionInfo member function
  *  returns an instance of type RTPUDPv4TransmissionInfo.
  */
-class RTPUDPv4Transmitter: public RTPTransmitter
+class QRTPLIB_API RTPUDPv4Transmitter: public RTPTransmitter
 {
 public:
     RTPUDPv4Transmitter();

qrtplib/rtpudpv4transmitternobind.h

@@ -47,6 +47,8 @@
 #include "rtpabortdescriptors.h"
 #include <list>
 
+#include "util/export.h"
+
 #define RTPUDPV4TRANSNOBIND_HASHSIZE							8317
 #define RTPUDPV4TRANSNOBIND_DEFAULTPORTBASE						5000
 
@@ -59,7 +61,7 @@ namespace qrtplib
 {
 
 /** Parameters for the UDP over IPv4 transmitter that does not automatically bind sockets */
-class RTPUDPv4TransmissionNoBindParams: public RTPTransmissionParams
+class QRTPLIB_API RTPUDPv4TransmissionNoBindParams: public RTPTransmissionParams
 {
 public:
     RTPUDPv4TransmissionNoBindParams();
@@ -294,7 +296,7 @@ inline RTPUDPv4TransmissionNoBindParams::RTPUDPv4TransmissionNoBindParams() :
 }
 
 /** Additional information about the UDP over IPv4 transmitter that does not automatically bind sockets. */
-class RTPUDPv4TransmissionNoBindInfo: public RTPTransmissionInfo
+class QRTPLIB_API RTPUDPv4TransmissionNoBindInfo: public RTPTransmissionInfo
 {
 public:
     RTPUDPv4TransmissionNoBindInfo(const QHostAddress& ip, SocketType rtpsock, SocketType rtcpsock, uint16_t rtpport, uint16_t rtcpport) :
@@ -375,7 +377,7 @@ public:
  *  This flavor of a RTPUDPv4Transmitter class does not automatically bind sockets. Use the
  *  BindSockets method to do so.
  */
-class RTPUDPv4TransmitterNoBind: public RTPTransmitter
+class QRTPLIB_API RTPUDPv4TransmitterNoBind: public RTPTransmitter
 {
 public:
     RTPUDPv4TransmitterNoBind();

sdrbase/audio/audiodeviceinfo.h

@@ -24,7 +24,7 @@
 
 #include "util/export.h"
 
-class SDRANGEL_API AudioDeviceInfo {
+class SDRBASE_API AudioDeviceInfo {
 public:
 	AudioDeviceInfo();
 

sdrbase/audio/audiofifo.h

@@ -26,7 +26,7 @@
 #include "util/export.h"
 #include "util/udpsink.h"
 
-class SDRANGEL_API AudioFifo : public QObject {
+class SDRBASE_API AudioFifo : public QObject {
 	Q_OBJECT
 public:
 	AudioFifo();

sdrbase/audio/audioinput.h

@@ -29,7 +29,7 @@ class AudioFifo;
 class AudioOutputPipe;
 
 
-class SDRANGEL_API AudioInput : public QIODevice {
+class SDRBASE_API AudioInput : public QIODevice {
 public:
 	AudioInput();
 	virtual ~AudioInput();

sdrbase/audio/audionetsink.h

@@ -25,7 +25,7 @@
 template<typename T> class UDPSink;
 class RTPSink;
 
-class SDRANGEL_API AudioNetSink {
+class SDRBASE_API AudioNetSink {
 public:
     typedef enum
     {

sdrbase/audio/audiooutput.h

@@ -29,7 +29,7 @@ class QAudioOutput;
 class AudioFifo;
 class AudioOutputPipe;
 
-class SDRANGEL_API AudioOutput : QIODevice {
+class SDRBASE_API AudioOutput : QIODevice {
 public:
 	AudioOutput();
 	virtual ~AudioOutput();

sdrbase/channel/channelsinkapi.h

@@ -30,7 +30,7 @@ namespace SWGSDRangel
     class SWGChannelSettings;
 }
 
-class SDRANGEL_API ChannelSinkAPI {
+class SDRBASE_API ChannelSinkAPI {
 public:
     ChannelSinkAPI(const QString& name);
     virtual ~ChannelSinkAPI() {}

sdrbase/channel/channelsourceapi.h

@@ -29,7 +29,7 @@ namespace SWGSDRangel
     class SWGChannelSettings;
 }
 
-class SDRANGEL_API ChannelSourceAPI {
+class SDRBASE_API ChannelSourceAPI {
 public:
     ChannelSourceAPI(const QString& name);
     virtual ~ChannelSourceAPI() {}

sdrbase/commands/command.h

@@ -25,7 +25,9 @@
 #include <QProcess>
 #include <sys/time.h>
 
-class Command : public QObject
+#include "util/export.h"
+
+class SDRBASE_API Command : public QObject
 {
     Q_OBJECT
 public:

sdrbase/device/deviceenumerator.h

@@ -20,10 +20,11 @@
 #include <vector>
 
 #include "plugin/plugininterface.h"
+#include "util/export.h"
 
 class PluginManager;
 
-class DeviceEnumerator
+class SDRBASE_API DeviceEnumerator
 {
 public:
     DeviceEnumerator();

sdrbase/device/devicesinkapi.h

@@ -33,7 +33,7 @@ class Preset;
 class DeviceSourceAPI;
 class ChannelSourceAPI;
 
-class SDRANGEL_API DeviceSinkAPI : public QObject {
+class SDRBASE_API DeviceSinkAPI : public QObject {
     Q_OBJECT
 
 public:

sdrbase/device/devicesourceapi.h

@@ -35,7 +35,7 @@ class Preset;
 class DeviceSinkAPI;
 class ChannelSinkAPI;
 
-class SDRANGEL_API DeviceSourceAPI : public QObject {
+class SDRBASE_API DeviceSourceAPI : public QObject {
     Q_OBJECT
 
 public:

sdrbase/dsp/afsquelch.h

@@ -19,11 +19,12 @@
 
 #include "dsp/dsptypes.h"
 #include "dsp/movingaverage.h"
+#include "util/export.h"
 
 /** AFSquelch: AF squelch class based on the Modified Goertzel
  * algorithm.
  */
-class AFSquelch {
+class SDRBASE_API AFSquelch {
 public:
     // allows user defined tone pair
 	AFSquelch(unsigned int nbTones,

sdrbase/dsp/agc.h

@@ -10,8 +10,9 @@
 
 #include "movingaverage.h"
 #include "util/movingaverage.h"
+#include "util/export.h"
 
-class AGC
+class SDRBASE_API AGC
 {
 public:
 	AGC(int historySize, double R);
@@ -32,7 +33,7 @@ protected:
 };
 
 
-class MagAGC : public AGC
+class SDRBASE_API MagAGC : public AGC
 {
 public:
 	MagAGC(int historySize, double R, double threshold);

sdrbase/dsp/basebandsamplesink.h

@@ -25,7 +25,7 @@
 
 class Message;
 
-class SDRANGEL_API BasebandSampleSink : public QObject {
+class SDRBASE_API BasebandSampleSink : public QObject {
 	Q_OBJECT
 public:
 	BasebandSampleSink();

sdrbase/dsp/basebandsamplesource.h

@@ -26,7 +26,7 @@
 
 class Message;
 
-class SDRANGEL_API BasebandSampleSource : public QObject {
+class SDRBASE_API BasebandSampleSource : public QObject {
 	Q_OBJECT
 public:
 	BasebandSampleSource();

sdrbase/dsp/channelmarker.h

@@ -8,7 +8,7 @@
 #include "settings/serializable.h"
 #include "util/export.h"
 
-class SDRANGEL_API ChannelMarker : public QObject, public Serializable {
+class SDRBASE_API ChannelMarker : public QObject, public Serializable {
 	Q_OBJECT
 
 public:

sdrbase/dsp/ctcssdetector.h

@@ -10,12 +10,13 @@
 #define INCLUDE_GPL_DSP_CTCSSDETECTOR_H_
 
 #include "dsp/dsptypes.h"
+#include "util/export.h"
 
 /** CTCSSDetector: Continuous Tone Coded Squelch System
  * tone detector class based on the Modified Goertzel
  * algorithm.
  */
-class CTCSSDetector {
+class SDRBASE_API CTCSSDetector {
 public:
     // Constructors and Destructor
     CTCSSDetector();

sdrbase/dsp/cwkeyer.h

@@ -28,7 +28,7 @@
 /**
  * Ancillary class to smooth out CW transitions with a sine shape
  */
-class CWSmoother
+class SDRBASE_API CWSmoother
 {
 public:
     CWSmoother();
@@ -46,7 +46,7 @@ private:
     float *m_fadeOutSamples;
 };
 
-class SDRANGEL_API CWKeyer : public QObject {
+class SDRBASE_API CWKeyer : public QObject {
     Q_OBJECT
 
 public:

sdrbase/dsp/cwkeyersettings.h

@@ -21,7 +21,9 @@
 #include <QString>
 #include <QByteArray>
 
-class CWKeyerSettings
+#include "util/export.h"
+
+class SDRBASE_API CWKeyerSettings
 {
 public:
     typedef enum

sdrbase/dsp/decimatorsf.h

@@ -18,10 +18,11 @@
 #define SDRBASE_DSP_DECIMATORSF_H_
 
 #include "dsp/inthalfbandfilterdbf.h"
+#include "util/export.h"
 
 #define DECIMATORSF_HB_FILTER_ORDER 64
 
-class DecimatorsF
+class SDRBASE_API DecimatorsF
 {
 public:
     void decimate1(SampleVector::iterator* it, const float* buf, qint32 nbIAndQ);

sdrbase/dsp/devicesamplesink.h

@@ -31,7 +31,7 @@ namespace SWGSDRangel
     class SWGDeviceState;
 }
 
-class SDRANGEL_API DeviceSampleSink : public QObject {
+class SDRBASE_API DeviceSampleSink : public QObject {
 	Q_OBJECT
 public:
 	DeviceSampleSink();

sdrbase/dsp/devicesamplesource.h

@@ -32,7 +32,7 @@ namespace SWGSDRangel
     class SWGDeviceState;
 }
 
-class SDRANGEL_API DeviceSampleSource : public QObject {
+class SDRBASE_API DeviceSampleSource : public QObject {
 	Q_OBJECT
 public:
 	DeviceSampleSource();

sdrbase/dsp/downchannelizer.h

@@ -37,7 +37,7 @@
 
 class MessageQueue;
 
-class SDRANGEL_API DownChannelizer : public BasebandSampleSink {
+class SDRBASE_API DownChannelizer : public BasebandSampleSink {
 	Q_OBJECT
 public:
 	class SDRANGEL_API MsgChannelizerNotification : public Message {

sdrbase/dsp/dspcommands.h

@@ -31,31 +31,31 @@ class BasebandSampleSource;
 class ThreadedBasebandSampleSource;
 class AudioFifo;
 
-class SDRANGEL_API DSPAcquisitionInit : public Message {
+class SDRBASE_API DSPAcquisitionInit : public Message {
 	MESSAGE_CLASS_DECLARATION
 };
 
-class SDRANGEL_API DSPAcquisitionStart : public Message {
+class SDRBASE_API DSPAcquisitionStart : public Message {
 	MESSAGE_CLASS_DECLARATION
 };
 
-class SDRANGEL_API DSPAcquisitionStop : public Message {
+class SDRBASE_API DSPAcquisitionStop : public Message {
 	MESSAGE_CLASS_DECLARATION
 };
 
-class SDRANGEL_API DSPGenerationInit : public Message {
+class SDRBASE_API DSPGenerationInit : public Message {
 	MESSAGE_CLASS_DECLARATION
 };
 
-class SDRANGEL_API DSPGenerationStart : public Message {
+class SDRBASE_API DSPGenerationStart : public Message {
 	MESSAGE_CLASS_DECLARATION
 };
 
-class SDRANGEL_API DSPGenerationStop : public Message {
+class SDRBASE_API DSPGenerationStop : public Message {
 	MESSAGE_CLASS_DECLARATION
 };
 
-class SDRANGEL_API DSPGetSourceDeviceDescription : public Message {
+class SDRBASE_API DSPGetSourceDeviceDescription : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -66,7 +66,7 @@ private:
 	QString m_deviceDescription;
 };
 
-class SDRANGEL_API DSPGetSinkDeviceDescription : public Message {
+class SDRBASE_API DSPGetSinkDeviceDescription : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -77,7 +77,7 @@ private:
 	QString m_deviceDescription;
 };
 
-class SDRANGEL_API DSPGetErrorMessage : public Message {
+class SDRBASE_API DSPGetErrorMessage : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -88,7 +88,7 @@ private:
 	QString m_errorMessage;
 };
 
-class SDRANGEL_API DSPSetSource : public Message {
+class SDRBASE_API DSPSetSource : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -100,7 +100,7 @@ private:
 	DeviceSampleSource* m_sampleSource;
 };
 
-class SDRANGEL_API DSPSetSink : public Message {
+class SDRBASE_API DSPSetSink : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -112,7 +112,7 @@ private:
 	DeviceSampleSink* m_sampleSink;
 };
 
-class SDRANGEL_API DSPAddBasebandSampleSink : public Message {
+class SDRBASE_API DSPAddBasebandSampleSink : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -124,7 +124,7 @@ private:
 	BasebandSampleSink* m_sampleSink;
 };
 
-class SDRANGEL_API DSPAddSpectrumSink : public Message {
+class SDRBASE_API DSPAddSpectrumSink : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -136,7 +136,7 @@ private:
 	BasebandSampleSink* m_sampleSink;
 };
 
-class SDRANGEL_API DSPAddBasebandSampleSource : public Message {
+class SDRBASE_API DSPAddBasebandSampleSource : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -148,7 +148,7 @@ private:
 	BasebandSampleSource* m_sampleSource;
 };
 
-class SDRANGEL_API DSPRemoveBasebandSampleSink : public Message {
+class SDRBASE_API DSPRemoveBasebandSampleSink : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -160,7 +160,7 @@ private:
 	BasebandSampleSink* m_sampleSink;
 };
 
-class SDRANGEL_API DSPRemoveSpectrumSink : public Message {
+class SDRBASE_API DSPRemoveSpectrumSink : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -172,7 +172,7 @@ private:
 	BasebandSampleSink* m_sampleSink;
 };
 
-class SDRANGEL_API DSPRemoveBasebandSampleSource : public Message {
+class SDRBASE_API DSPRemoveBasebandSampleSource : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -184,7 +184,7 @@ private:
 	BasebandSampleSource* m_sampleSource;
 };
 
-class SDRANGEL_API DSPAddThreadedBasebandSampleSink : public Message {
+class SDRBASE_API DSPAddThreadedBasebandSampleSink : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -196,7 +196,7 @@ private:
 	ThreadedBasebandSampleSink* m_threadedSampleSink;
 };
 
-class SDRANGEL_API DSPAddThreadedBasebandSampleSource : public Message {
+class SDRBASE_API DSPAddThreadedBasebandSampleSource : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -208,7 +208,7 @@ private:
 	ThreadedBasebandSampleSource* m_threadedSampleSource;
 };
 
-class SDRANGEL_API DSPRemoveThreadedBasebandSampleSink : public Message {
+class SDRBASE_API DSPRemoveThreadedBasebandSampleSink : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -220,7 +220,7 @@ private:
 	ThreadedBasebandSampleSink* m_threadedSampleSink;
 };
 
-class SDRANGEL_API DSPRemoveThreadedBasebandSampleSource : public Message {
+class SDRBASE_API DSPRemoveThreadedBasebandSampleSource : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -232,7 +232,7 @@ private:
 	ThreadedBasebandSampleSource* m_threadedSampleSource;
 };
 
-class SDRANGEL_API DSPAddAudioSink : public Message {
+class SDRBASE_API DSPAddAudioSink : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -244,7 +244,7 @@ private:
 	AudioFifo* m_audioFifo;
 };
 
-class SDRANGEL_API DSPRemoveAudioSink : public Message {
+class SDRBASE_API DSPRemoveAudioSink : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -256,7 +256,7 @@ private:
 	AudioFifo* m_audioFifo;
 };
 
-class SDRANGEL_API DSPConfigureSpectrumVis : public Message {
+class SDRBASE_API DSPConfigureSpectrumVis : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -277,7 +277,7 @@ private:
 	FFTWindow::Function m_window;
 };
 
-class SDRANGEL_API DSPConfigureCorrection : public Message {
+class SDRBASE_API DSPConfigureCorrection : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -296,7 +296,7 @@ private:
 
 };
 
-class SDRANGEL_API DSPEngineReport : public Message {
+class SDRBASE_API DSPEngineReport : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -314,7 +314,7 @@ private:
 	quint64 m_centerFrequency;
 };
 
-class SDRANGEL_API DSPConfigureScopeVis : public Message {
+class SDRBASE_API DSPConfigureScopeVis : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -335,7 +335,7 @@ private:
 	Real m_triggerLevelLow;
 };
 
-class SDRANGEL_API DSPSignalNotification : public Message {
+class SDRBASE_API DSPSignalNotification : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:
@@ -353,7 +353,7 @@ private:
 	qint64 m_centerFrequency;
 };
 
-class SDRANGEL_API DSPConfigureChannelizer : public Message {
+class SDRBASE_API DSPConfigureChannelizer : public Message {
 	MESSAGE_CLASS_DECLARATION
 
 public:

sdrbase/dsp/dspdevicesinkengine.h

@@ -36,7 +36,7 @@ class BasebandSampleSource;
 class ThreadedBasebandSampleSource;
 class BasebandSampleSink;
 
-class SDRANGEL_API DSPDeviceSinkEngine : public QThread {
+class SDRBASE_API DSPDeviceSinkEngine : public QThread {
 	Q_OBJECT
 
 public:

sdrbase/dsp/dspdevicesourceengine.h

@@ -33,7 +33,7 @@ class DeviceSampleSource;
 class BasebandSampleSink;
 class ThreadedBasebandSampleSink;
 
-class SDRANGEL_API DSPDeviceSourceEngine : public QThread {
+class SDRBASE_API DSPDeviceSourceEngine : public QThread {
 	Q_OBJECT
 
 public:

sdrbase/dsp/dspengine.h

@@ -32,7 +32,7 @@
 class DSPDeviceSourceEngine;
 class DSPDeviceSinkEngine;
 
-class SDRANGEL_API DSPEngine : public QObject {
+class SDRBASE_API DSPEngine : public QObject {
 	Q_OBJECT
 public:
 	DSPEngine();

sdrbase/dsp/dvserialengine.h

@@ -24,11 +24,13 @@
 #include <string>
 #include <list>
 
+#include "util/export.h"
+
 class QThread;
 class DVSerialWorker;
 class AudioFifo;
 
-class DVSerialEngine : public QObject
+class SDRBASE_API DVSerialEngine : public QObject
 {
     Q_OBJECT
 public:

sdrbase/dsp/dvserialworker.h

@@ -29,12 +29,13 @@
 #include "util/message.h"
 #include "util/syncmessenger.h"
 #include "util/messagequeue.h"
+#include "util/export.h"
 #include "dsp/filtermbe.h"
 #include "dsp/dsptypes.h"
 
 class AudioFifo;
 
-class DVSerialWorker : public QObject {
+class SDRBASE_API DVSerialWorker : public QObject {
     Q_OBJECT
 public:
     class MsgTest : public Message

sdrbase/dsp/fftengine.h

@@ -4,7 +4,7 @@
 #include "dsp/dsptypes.h"
 #include "util/export.h"
 
-class SDRANGEL_API FFTEngine {
+class SDRBASE_API FFTEngine {
 public:
 	virtual ~FFTEngine();
 

sdrbase/dsp/fftfilt.h

@@ -7,13 +7,14 @@
 
 #include <complex>
 #include "gfft.h"
+#include "util/export.h"
 
 #undef M_PI
 #define M_PI 3.14159265358979323846
 
 //----------------------------------------------------------------------
 
-class fftfilt {
+class SDRBASE_API fftfilt {
 enum {NONE, BLACKMAN, HAMMING, HANNING};
 
 public:
@@ -66,7 +67,7 @@ protected:
 
 
 /* Sliding FFT filter from Fldigi */
-class sfft {
+class SDRBASE_API sfft {
 #define K1 0.99999
 public:
 	typedef std::complex<float> cmplx;

sdrbase/dsp/fftwengine.h

@@ -5,8 +5,9 @@
 #include <fftw3.h>
 #include <list>
 #include "dsp/fftengine.h"
+#include "util/export.h"
 
-class FFTWEngine : public FFTEngine {
+class SDRBASE_API FFTWEngine : public FFTEngine {
 public:
 	FFTWEngine();
 	~FFTWEngine();