fix building on Windows with VS2010

11 files changed, 69 insertions, 16 deletions

diff --git a/include/dsp/channelmarker.h b/include/dsp/channelmarker.h
index 229e7f1..06cd5b9 100644
--- a/include/dsp/channelmarker.h
+++ b/include/dsp/channelmarker.h
@@ -3,8 +3,9 @@
 
 #include <QObject>
 #include <QColor>
+#include "util/export.h"
 
-class ChannelMarker : public QObject {
+class SDRANGELOVE_API ChannelMarker : public QObject {
 	Q_OBJECT
 
 public:
diff --git a/include/dsp/samplefifo.h b/include/dsp/samplefifo.h
index 2ab3110..6fb05a7 100644
--- a/include/dsp/samplefifo.h
+++ b/include/dsp/samplefifo.h
@@ -22,8 +22,9 @@
 #include <QMutex>
 #include <QTime>
 #include "dsp/dsptypes.h"
+#include "util/export.h"
 
-class SampleFifo : public QObject {
+class SDRANGELOVE_API SampleFifo : public QObject {
 	Q_OBJECT
 
 private:
@@ -45,9 +46,6 @@ public:
 	SampleFifo(int size, QObject* parent = NULL);
 	~SampleFifo();
 
-	SampleFifo(const SampleFifo&);
-	SampleFifo& operator=(const SampleFifo&);
-
 	bool setSize(int size);
 	inline uint fill() const { return m_fill; }
 
diff --git a/include/dsp/samplesink.h b/include/dsp/samplesink.h
index 8a02bc8..8ca6d97 100644
--- a/include/dsp/samplesink.h
+++ b/include/dsp/samplesink.h
@@ -2,10 +2,11 @@
 #define INCLUDE_SAMPLESINK_H
 
 #include "dsptypes.h"
+#include "util/export.h"
 
 class Message;
 
-class SampleSink {
+class SDRANGELOVE_API SampleSink {
 public:
 	SampleSink();
 	virtual ~SampleSink();
diff --git a/include/dsp/samplesource/samplesource.h b/include/dsp/samplesource/samplesource.h
index 0328a90..1e50c99 100644
--- a/include/dsp/samplesource/samplesource.h
+++ b/include/dsp/samplesource/samplesource.h
@@ -21,13 +21,14 @@
 #include <QtGlobal>
 #include "dsp/samplefifo.h"
 #include "util/message.h"
+#include "util/export.h"
 
 class PluginGUI;
 class MessageQueue;
 
-class SampleSource {
+class SDRANGELOVE_API SampleSource {
 public:
-	struct GeneralSettings {
+	struct SDRANGELOVE_API GeneralSettings {
 		quint64 m_centerFrequency;
 
 		GeneralSettings();
diff --git a/include/dsp/threadedsamplesink.h b/include/dsp/threadedsamplesink.h
index f7e704e..4eaa46d 100644
--- a/include/dsp/threadedsamplesink.h
+++ b/include/dsp/threadedsamplesink.h
@@ -5,11 +5,12 @@
 #include "samplesink.h"
 #include "dsp/samplefifo.h"
 #include "util/messagequeue.h"
+#include "util/export.h"
 
 class QThread;
 class SampleSink;
 
-class ThreadedSampleSink : public QObject, public SampleSink {
+class SDRANGELOVE_API ThreadedSampleSink : public QObject, public SampleSink {
 	Q_OBJECT
 
 public:
diff --git a/include/plugin/pluginapi.h b/include/plugin/pluginapi.h
index 515eb0d..e1cfb1a 100644
--- a/include/plugin/pluginapi.h
+++ b/include/plugin/pluginapi.h
@@ -2,6 +2,7 @@
 #define INCLUDE_PLUGINAPI_H
 
 #include <QObject>
+#include "util/export.h"
 
 class QDockWidget;
 class QAction;
@@ -17,7 +18,7 @@ class MainWindow;
 class ChannelMarker;
 class PluginGUI;
 
-class PluginAPI : public QObject {
+class SDRANGELOVE_API PluginAPI : public QObject {
 	Q_OBJECT
 
 public:
diff --git a/include/plugin/plugingui.h b/include/plugin/plugingui.h
index 2e48079..9af77ec 100644
--- a/include/plugin/plugingui.h
+++ b/include/plugin/plugingui.h
@@ -2,10 +2,11 @@
 #define INCLUDE_PLUGINGUI_H
 
 #include <QWidget>
+#include "util/export.h"
 
 class Message;
 
-class PluginGUI : public QWidget {
+class SDRANGELOVE_API PluginGUI : public QWidget {
 	Q_OBJECT
 
 public:
diff --git a/include/util/export.h b/include/util/export.h
new file mode 100644
index 0000000..2b5f36d
--- /dev/null
+++ b/include/util/export.h
@@ -0,0 +1,46 @@
+/*

+ * Copyright (C) 2012 by Hoernchen <la@tfc-server.de>

+ *

+ * This program is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation, either version 2 of the License, or

+ * (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.

+ */

+

+#ifndef __SDRANGELOVE_EXPORT_H

+#define __SDRANGELOVE_EXPORT_H

+

+#if defined __GNUC__

+#  if __GNUC__ >= 4

+#    define __SDR_EXPORT   __attribute__((visibility("default")))

+#    define __SDR_IMPORT   __attribute__((visibility("default")))

+#  else

+#    define __SDR_EXPORT

+#    define __SDR_IMPORT

+#  endif

+#elif _MSC_VER

+#  define __SDR_EXPORT     __declspec(dllexport)

+#  define __SDR_IMPORT     __declspec(dllimport)

+#else

+#  define __SDR_EXPORT

+#  define __SDR_IMPORT

+#endif

+

+#ifndef sdrangelove_STATIC

+#	ifdef sdrangelove_EXPORTS

+#	define SDRANGELOVE_API __SDR_EXPORT

+#	else

+#	define SDRANGELOVE_API __SDR_IMPORT

+#	endif

+#else

+#define SDRANGELOVE_API

+#endif

+#endif /* __SDRANGELOVE_EXPORT_H */

diff --git a/include/util/message.h b/include/util/message.h
index 8718496..95e89ef 100644
--- a/include/util/message.h
+++ b/include/util/message.h
@@ -3,12 +3,13 @@
 
 #include <QAtomicInt>
 #include <QStringList>
+#include "util/export.h"
 
 class MessageQueue;
 class QWaitCondition;
 class QMutex;
 
-class MessageRegistrator {
+class SDRANGELOVE_API MessageRegistrator {
 public:
 	MessageRegistrator(const char* name);
 	int operator()() const { return m_registeredID; }
@@ -19,7 +20,7 @@ private:
 	int m_registeredID;
 };
 
-class Message {
+class SDRANGELOVE_API Message {
 public:
 	virtual ~Message();
 
diff --git a/include/util/messagequeue.h b/include/util/messagequeue.h
index bf99ea2..737d2b3 100644
--- a/include/util/messagequeue.h
+++ b/include/util/messagequeue.h
@@ -4,10 +4,11 @@
 #include <QObject>
 #include <QQueue>
 #include "spinlock.h"
+#include "util/export.h"
 
 class Message;
 
-class MessageQueue : public QObject {
+class SDRANGELOVE_API MessageQueue : public QObject {
 	Q_OBJECT
 
 public:
diff --git a/include/util/simpleserializer.h b/include/util/simpleserializer.h
index 3893c32..1388aa5 100644
--- a/include/util/simpleserializer.h
+++ b/include/util/simpleserializer.h
@@ -4,8 +4,9 @@
 #include <QString>
 #include <QMap>
 #include "dsp/dsptypes.h"
+#include "util/export.h"
 
-class SimpleSerializer {
+class SDRANGELOVE_API SimpleSerializer {
 public:
 	SimpleSerializer(quint32 version);
 
@@ -47,7 +48,7 @@ protected:
 	bool writeTag(Type type, quint32 id, quint32 length);
 };
 
-class SimpleDeserializer {
+class SDRANGELOVE_API SimpleDeserializer {
 public:
 	SimpleDeserializer(const QByteArray& data);