Use CMake GenerateExportHeader

CMakeLists.txt

@@ -19,6 +19,7 @@ INCLUDE(CheckSubmodules)
 INCLUDE(AddFileDependencies)
 INCLUDE(CheckIncludeFiles)
 INCLUDE(FindPkgConfig)
+INCLUDE(GenerateExportHeader)
 
 STRING(TOUPPER          "${CMAKE_PROJECT_NAME}" PROJECT_NAME_UCASE)
 

cmake/modules/BuildPlugin.cmake

@@ -6,7 +6,7 @@
 INCLUDE(GenQrc)
 
 MACRO(BUILD_PLUGIN PLUGIN_NAME)
-	CMAKE_PARSE_ARGUMENTS(PLUGIN "" "" "MOCFILES;EMBEDDED_RESOURCES;UICFILES;LINK" ${ARGN})
+	CMAKE_PARSE_ARGUMENTS(PLUGIN "" "LINK;EXPORT_BASE_NAME" "MOCFILES;EMBEDDED_RESOURCES;UICFILES" ${ARGN})
 	SET(PLUGIN_SOURCES ${PLUGIN_UNPARSED_ARGUMENTS})
 
 	INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_SOURCE_DIR}/include")
@@ -62,7 +62,7 @@ MACRO(BUILD_PLUGIN PLUGIN_NAME)
 		TARGET_LINK_LIBRARIES(${PLUGIN_NAME} lmms)
 	ENDIF(LMMS_BUILD_WIN32)
 
-	INSTALL(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION "${PLUGIN_DIR}")
+	INSTALL(TARGETS ${PLUGIN_NAME} DESTINATION "${PLUGIN_DIR}")
 
 	IF(LMMS_BUILD_APPLE)
 		SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES LINK_FLAGS "-bundle_loader \"${CMAKE_BINARY_DIR}/lmms\"")
@@ -74,5 +74,16 @@ MACRO(BUILD_PLUGIN PLUGIN_NAME)
 	ENDIF()
 
 	SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${RCC_OUT} ${plugin_MOC_out}")
+
+	IF(NOT PLUGIN_EXPORT_BASE_NAME)
+		SET(PLUGIN_EXPORT_BASE_NAME "PLUGIN")
+	ENDIF()
+
+	GENERATE_EXPORT_HEADER(${PLUGIN_NAME}
+		BASE_NAME ${PLUGIN_EXPORT_BASE_NAME}
+	)
+	TARGET_INCLUDE_DIRECTORIES(${PLUGIN_NAME}
+		PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+	)
 ENDMACRO(BUILD_PLUGIN)
 

include/AutomatableButton.h

@@ -34,7 +34,7 @@
 class automatableButtonGroup;
 
 
-class EXPORT AutomatableButton : public QPushButton, public BoolModelView
+class LMMS_EXPORT AutomatableButton : public QPushButton, public BoolModelView
 {
 	Q_OBJECT
 public:
@@ -79,7 +79,7 @@ private:
 
 
 
-class EXPORT automatableButtonGroup : public QWidget, public IntModelView
+class LMMS_EXPORT automatableButtonGroup : public QWidget, public IntModelView
 {
 	Q_OBJECT
 public:

include/AutomatableModel.h

@@ -63,7 +63,7 @@
 
 class ControllerConnection;
 
-class EXPORT AutomatableModel : public Model, public JournallingObject
+class LMMS_EXPORT AutomatableModel : public Model, public JournallingObject
 {
 	Q_OBJECT
 	MM_OPERATORS
@@ -349,7 +349,7 @@ signals:
 
 
 
-template <typename T> class EXPORT TypedAutomatableModel : public AutomatableModel
+template <typename T> class LMMS_EXPORT TypedAutomatableModel : public AutomatableModel
 {
 public:
 	using AutomatableModel::AutomatableModel;
@@ -377,7 +377,7 @@ public:
 
 // some typed AutomatableModel-definitions
 
-class EXPORT FloatModel : public TypedAutomatableModel<float>
+class LMMS_EXPORT FloatModel : public TypedAutomatableModel<float>
 {
 	Q_OBJECT
 public:
@@ -394,7 +394,7 @@ public:
 } ;
 
 
-class EXPORT IntModel : public TypedAutomatableModel<int>
+class LMMS_EXPORT IntModel : public TypedAutomatableModel<int>
 {
 	Q_OBJECT
 public:
@@ -409,7 +409,7 @@ public:
 } ;
 
 
-class EXPORT BoolModel : public TypedAutomatableModel<bool>
+class LMMS_EXPORT BoolModel : public TypedAutomatableModel<bool>
 {
 	Q_OBJECT
 public:

include/AutomatableModelView.h

@@ -32,7 +32,7 @@
 class QMenu;
 class QMouseEvent;
 
-class EXPORT AutomatableModelView : public ModelView
+class LMMS_EXPORT AutomatableModelView : public ModelView
 {
 public:
 	AutomatableModelView( Model* model, QWidget* _this );
@@ -106,7 +106,7 @@ protected:
 
 
 
-template <typename ModelType> class EXPORT TypedModelView : public AutomatableModelView
+template <typename ModelType> class LMMS_EXPORT TypedModelView : public AutomatableModelView
 {
 public:
 	TypedModelView( Model* model, QWidget* _this) :
@@ -127,6 +127,5 @@ using FloatModelView = TypedModelView<FloatModel>;
 using IntModelView = TypedModelView<IntModel>;
 using BoolModelView = TypedModelView<BoolModel>;
 
-
 #endif
 

include/AutomationPattern.h

@@ -38,7 +38,7 @@ class MidiTime;
 
 
 
-class EXPORT AutomationPattern : public TrackContentObject
+class LMMS_EXPORT AutomationPattern : public TrackContentObject
 {
 	Q_OBJECT
 public:

include/BBTrack.h

@@ -125,7 +125,7 @@ private:
 
 
 
-class EXPORT BBTrack : public Track
+class LMMS_EXPORT BBTrack : public Track
 {
 	Q_OBJECT
 public:

include/BBTrackContainer.h

@@ -30,7 +30,7 @@
 #include "ComboBoxModel.h"
 
 
-class EXPORT BBTrackContainer : public TrackContainer
+class LMMS_EXPORT BBTrackContainer : public TrackContainer
 {
 	Q_OBJECT
 	mapPropertyFromModel(int,currentBB,setCurrentBB,m_bbComboBoxModel);

include/BandLimitedWave.h

@@ -29,7 +29,7 @@
 class QDataStream;
 class QString;
 
-#include "export.h"
+#include "lmms_export.h"
 #include "interpolation.h"
 #include "lmms_basics.h"
 #include "lmms_math.h"
@@ -82,7 +82,7 @@ QDataStream& operator>> ( QDataStream &in, WaveMipMap &waveMipMap );
 
 
 
-class EXPORT BandLimitedWave
+class LMMS_EXPORT BandLimitedWave
 {
 public:
 	enum Waveforms

include/BufferManager.h

@@ -26,10 +26,10 @@
 #ifndef BUFFER_MANAGER_H
 #define BUFFER_MANAGER_H
 
-#include "export.h"
+#include "lmms_export.h"
 #include "lmms_basics.h"
 
-class EXPORT BufferManager
+class LMMS_EXPORT BufferManager
 {
 public:
 	static void init( fpp_t framesPerPeriod );

include/CaptionMenu.h

@@ -28,12 +28,12 @@
 
 #include <QMenu>
 
-#include "export.h"
+#include "lmms_export.h"
 
 ///
 /// \brief A context menu with a caption
 ///
-class EXPORT CaptionMenu : public QMenu
+class LMMS_EXPORT CaptionMenu : public QMenu
 {
 	Q_OBJECT
 public:

include/ComboBox.h

@@ -34,7 +34,7 @@
 
 
 
-class EXPORT ComboBox : public QWidget, public IntModelView
+class LMMS_EXPORT ComboBox : public QWidget, public IntModelView
 {
 	Q_OBJECT
 public:

include/ComboBoxModel.h

@@ -33,7 +33,7 @@
 #include "embed.h"
 
 
-class EXPORT ComboBoxModel : public IntModel
+class LMMS_EXPORT ComboBoxModel : public IntModel
 {
 	Q_OBJECT
 public:

include/ConfigManager.h

@@ -34,7 +34,7 @@
 #include <QtCore/QVector>
 #include <QtCore/QObject>
 
-#include "export.h"
+#include "lmms_export.h"
 
 class LmmsCore;
 
@@ -51,7 +51,7 @@ const QString TRACK_ICON_PATH = "track_icons/";
 const QString LOCALE_PATH = "locale/";
 
 
-class EXPORT ConfigManager : public QObject
+class LMMS_EXPORT ConfigManager : public QObject
 {
 	Q_OBJECT
 public:

include/Controller.h

@@ -27,7 +27,7 @@
 #ifndef CONTROLLER_H
 #define CONTROLLER_H
 
-#include "export.h"
+#include "lmms_export.h"
 #include "Engine.h"
 #include "Model.h"
 #include "JournallingObject.h"
@@ -41,7 +41,7 @@ class ControllerConnection;
 typedef QVector<Controller *> ControllerVector;
 
 
-class EXPORT Controller : public Model, public JournallingObject
+class LMMS_EXPORT Controller : public Model, public JournallingObject
 {
 	Q_OBJECT
 public:

include/ControllerConnection.h

@@ -42,7 +42,7 @@ class ControllerConnection;
 typedef QVector<ControllerConnection *> ControllerConnectionVector;
 
 
-class EXPORT ControllerConnection : public QObject, public JournallingObject
+class LMMS_EXPORT ControllerConnection : public QObject, public JournallingObject
 {
 	Q_OBJECT
 public:

include/DataFile.h

@@ -29,12 +29,12 @@
 
 #include <QDomDocument>
 
-#include "export.h"
+#include "lmms_export.h"
 #include "MemoryManager.h"
 
 class QTextStream;
 
-class EXPORT DataFile : public QDomDocument
+class LMMS_EXPORT DataFile : public QDomDocument
 {
 	MM_OPERATORS
 public:
@@ -134,7 +134,7 @@ private:
 	void loadData( const QByteArray & _data, const QString & _sourceFile );
 
 
-	struct EXPORT typeDescStruct
+	struct LMMS_EXPORT typeDescStruct
 	{
 		Type m_type;
 		QString m_name;

include/Effect.h

@@ -37,7 +37,7 @@ class EffectChain;
 class EffectControls;
 
 
-class EXPORT Effect : public Plugin
+class LMMS_EXPORT Effect : public Plugin
 {
 	MM_OPERATORS
 	Q_OBJECT

include/EffectChain.h

@@ -33,7 +33,7 @@
 class Effect;
 
 
-class EXPORT EffectChain : public Model, public SerializingObject
+class LMMS_EXPORT EffectChain : public Model, public SerializingObject
 {
 	Q_OBJECT
 public:

include/EffectControlDialog.h

@@ -33,7 +33,7 @@
 class EffectControls;
 
 
-class EXPORT EffectControlDialog : public QWidget, public ModelView
+class LMMS_EXPORT EffectControlDialog : public QWidget, public ModelView
 {
 	Q_OBJECT
 public:

include/Engine.h

@@ -30,7 +30,7 @@
 #include <QtCore/QObject>
 
 
-#include "export.h"
+#include "lmms_export.h"
 
 class BBTrackContainer;
 class DummyTrackContainer;
@@ -53,7 +53,7 @@ class Ladspa2LMMS;
 class LmmsCore;
 typedef LmmsCore Engine;
 
-class EXPORT LmmsCore : public QObject
+class LMMS_EXPORT LmmsCore : public QObject
 {
 	Q_OBJECT
 public:

include/EnvelopeAndLfoParameters.h

@@ -34,7 +34,7 @@
 #include "lmms_basics.h"
 
 
-class EXPORT EnvelopeAndLfoParameters : public Model, public JournallingObject
+class LMMS_EXPORT EnvelopeAndLfoParameters : public Model, public JournallingObject
 {
 	Q_OBJECT
 public:

include/ExportFilter.h

@@ -32,7 +32,7 @@
 #include "Plugin.h"
 
 
-class EXPORT ExportFilter : public Plugin
+class LMMS_EXPORT ExportFilter : public Plugin
 {
 public:
 	ExportFilter( const Descriptor * _descriptor ) : Plugin( _descriptor, NULL ) {}

include/Fader.h

@@ -57,7 +57,7 @@
 class TextFloat;
 
 
-class EXPORT Fader : public QWidget, public FloatModelView
+class LMMS_EXPORT Fader : public QWidget, public FloatModelView
 {
 	Q_OBJECT
 public:

include/FileDialog.h

@@ -28,9 +28,9 @@
 
 #include <QFileDialog>
 
-#include "export.h"
+#include "lmms_export.h"
 
-class EXPORT FileDialog : public QFileDialog
+class LMMS_EXPORT FileDialog : public QFileDialog
 {
 	Q_OBJECT
 public:

include/FxMixer.h

@@ -121,7 +121,7 @@ class FxRoute : public QObject
 };
 
 
-class EXPORT FxMixer : public Model, public JournallingObject
+class LMMS_EXPORT FxMixer : public Model, public JournallingObject
 {
 	Q_OBJECT
 public:

include/FxMixerView.h

@@ -41,7 +41,7 @@
 class QButtonGroup;
 class FxLine;
 
-class EXPORT FxMixerView : public QWidget, public ModelView,
+class LMMS_EXPORT FxMixerView : public QWidget, public ModelView,
 					public SerializingObjectHook
 {
 	Q_OBJECT

include/Graph.h

@@ -38,7 +38,7 @@
 class graphModel;
 
 
-class EXPORT Graph : public QWidget, public ModelView
+class LMMS_EXPORT Graph : public QWidget, public ModelView
 {
 	Q_OBJECT
 public:
@@ -111,7 +111,7 @@ private:
 } ;
 
 
-class EXPORT graphModel : public Model
+class LMMS_EXPORT graphModel : public Model
 {
 	Q_OBJECT
 public:

include/GuiApplication.h

@@ -27,7 +27,7 @@
 
 #include <QtCore/QObject>
 
-#include "export.h"
+#include "lmms_export.h"
 
 class QLabel;
 
@@ -40,7 +40,7 @@ class PianoRollWindow;
 class ProjectNotes;
 class SongEditorWindow;
 
-class EXPORT GuiApplication : public QObject
+class LMMS_EXPORT GuiApplication : public QObject
 {
 	Q_OBJECT;
 public:

include/ImportFilter.h

@@ -34,7 +34,7 @@
 class TrackContainer;
 
 
-class EXPORT ImportFilter : public Plugin
+class LMMS_EXPORT ImportFilter : public Plugin
 {
 public:
 	ImportFilter( const QString & _file_name,

include/Instrument.h

@@ -27,7 +27,7 @@
 #define INSTRUMENT_H
 
 #include <QString>
-#include "export.h"
+#include "lmms_export.h"
 #include "lmms_basics.h"
 #include "MemoryManager.h"
 #include "MidiTime.h"
@@ -41,7 +41,7 @@ class NotePlayHandle;
 class Track;
 
 
-class EXPORT Instrument : public Plugin
+class LMMS_EXPORT Instrument : public Plugin
 {
 	MM_OPERATORS
 public:

include/InstrumentPlayHandle.h

@@ -28,9 +28,9 @@
 #include "PlayHandle.h"
 #include "Instrument.h"
 #include "NotePlayHandle.h"
-#include "export.h"
+#include "lmms_export.h"
 
-class EXPORT InstrumentPlayHandle : public PlayHandle
+class LMMS_EXPORT InstrumentPlayHandle : public PlayHandle
 {
 public:
 	InstrumentPlayHandle( Instrument * instrument, InstrumentTrack* instrumentTrack );

include/InstrumentTrack.h

@@ -63,7 +63,7 @@ class LedCheckBox;
 class QLabel;
 
 
-class EXPORT InstrumentTrack : public Track, public MidiEventProcessor
+class LMMS_EXPORT InstrumentTrack : public Track, public MidiEventProcessor
 {
 	Q_OBJECT
 	MM_OPERATORS

include/InstrumentView.h

@@ -32,7 +32,7 @@
 class InstrumentTrackWindow;
 
 
-class EXPORT InstrumentView : public PluginView
+class LMMS_EXPORT InstrumentView : public PluginView
 {
 public:
 	InstrumentView( Instrument * _instrument, QWidget * _parent );

include/JournallingObject.h

@@ -31,7 +31,7 @@
 #include "SerializingObject.h"
 
 
-class EXPORT JournallingObject : public SerializingObject
+class LMMS_EXPORT JournallingObject : public SerializingObject
 {
 public:
 	JournallingObject();

include/Knob.h

@@ -43,7 +43,7 @@ enum knobTypes
 
 
 
-class EXPORT Knob : public QWidget, public FloatModelView
+class LMMS_EXPORT Knob : public QWidget, public FloatModelView
 {
 	Q_OBJECT
 	Q_ENUMS( knobTypes )

include/Ladspa2LMMS.h

@@ -30,7 +30,7 @@
 #include "LadspaManager.h"
 
 
-class EXPORT Ladspa2LMMS : public LadspaManager
+class LMMS_EXPORT Ladspa2LMMS : public LadspaManager
 {
 public:
 	

include/LadspaControl.h

@@ -36,7 +36,7 @@
 typedef struct PortDescription port_desc_t;
 
 
-class EXPORT LadspaControl : public Model, public JournallingObject
+class LMMS_EXPORT LadspaControl : public Model, public JournallingObject
 {
 	Q_OBJECT
 public:

include/LadspaControlView.h

@@ -33,7 +33,7 @@
 class LadspaControl;
 
 
-class EXPORT LadspaControlView : public QWidget, public ModelView
+class LMMS_EXPORT LadspaControlView : public QWidget, public ModelView
 {
 	Q_OBJECT
 public:

include/LadspaManager.h

@@ -36,7 +36,7 @@
 #include <QtCore/QStringList>
 
 
-#include "export.h"
+#include "lmms_export.h"
 #include "lmms_basics.h"
 
 
@@ -80,7 +80,7 @@ typedef struct ladspaManagerStorage
 } ladspaManagerDescription;
 
 
-class EXPORT LadspaManager
+class LMMS_EXPORT LadspaManager
 {
 public:
 

include/LcdSpinBox.h

@@ -30,7 +30,7 @@
 #include "AutomatableModelView.h"
 
 
-class EXPORT LcdSpinBox : public LcdWidget, public IntModelView
+class LMMS_EXPORT LcdSpinBox : public LcdWidget, public IntModelView
 {
 	Q_OBJECT
 public:

include/LcdWidget.h

@@ -29,9 +29,9 @@
 #include <QtCore/QMap>
 #include <QWidget>
 
-#include "export.h"
+#include "lmms_export.h"
 
-class EXPORT LcdWidget : public QWidget
+class LMMS_EXPORT LcdWidget : public QWidget
 {
 	Q_OBJECT
 	

include/LedCheckbox.h

@@ -32,7 +32,7 @@
 class QPixmap;
 
 
-class EXPORT LedCheckBox : public AutomatableButton
+class LMMS_EXPORT LedCheckBox : public AutomatableButton
 {
 	Q_OBJECT
 public:

include/LmmsPalette.h

@@ -24,13 +24,13 @@
  */
 
 #include <QWidget>
-#include "export.h"
+#include "lmms_export.h"
 
 #ifndef LMMSPALETTE_H
 #define LMMSPALETTE_H
 
 
-class EXPORT LmmsPalette : public QWidget
+class LMMS_EXPORT LmmsPalette : public QWidget
 {
 	Q_OBJECT
 	Q_PROPERTY( QColor background READ background WRITE setBackground )

include/MainWindow.h

@@ -61,7 +61,7 @@ public:
 	void addSpacingToToolBar( int _size );
 
 	// wrap the widget with a window decoration and add it to the workspace
-	EXPORT SubWindow* addWindowedWidget(QWidget *w, Qt::WindowFlags windowFlags=0);
+	LMMS_EXPORT SubWindow* addWindowedWidget(QWidget *w, Qt::WindowFlags windowFlags=0);
 
 
 	///

include/MemoryManager.h

@@ -30,9 +30,9 @@
 #include <cstddef>
 #include <vector>
 
-#include "export.h"
+#include "lmms_export.h"
 
-class EXPORT MemoryManager
+class LMMS_EXPORT MemoryManager
 {
 public:
 	struct ThreadGuard

include/MidiTime.h

@@ -29,7 +29,7 @@
 
 #include <QtGlobal>
 
-#include "export.h"
+#include "lmms_export.h"
 #include "lmms_basics.h"
 
 // note: 1 "Tact" = 1 Measure
@@ -40,7 +40,7 @@ const int DefaultBeatsPerTact = DefaultTicksPerTact / DefaultStepsPerTact;
 
 class MeterModel;
 
-class EXPORT TimeSig
+class LMMS_EXPORT TimeSig
 {
 public:
 	// in a time signature,
@@ -57,7 +57,7 @@ private:
 };
 
 
-class EXPORT MidiTime
+class LMMS_EXPORT MidiTime
 {
 public:
 	MidiTime( const tact_t tact, const tick_t ticks );

include/Mixer.h

@@ -66,7 +66,7 @@ const Octaves BaseOctave = DefaultOctave;
 class MixerWorkerThread;
 
 
-class EXPORT Mixer : public QObject
+class LMMS_EXPORT Mixer : public QObject
 {
 	Q_OBJECT
 public:

include/Model.h

@@ -28,10 +28,10 @@
 #include <QtCore/QString>
 #include <QtCore/QObject>
 
-#include "export.h"
+#include "lmms_export.h"
 
 
-class EXPORT Model : public QObject
+class LMMS_EXPORT Model : public QObject
 {
 	Q_OBJECT
 public:

include/ModelView.h

@@ -29,7 +29,7 @@
 #include "Model.h"
 
 
-class EXPORT ModelView
+class LMMS_EXPORT ModelView
 {
 public:
 	ModelView( Model* model, QWidget* widget );

include/Note.h

@@ -78,7 +78,7 @@ const float MaxDetuning = 4 * 12.0f;
 
 
 
-class EXPORT Note : public SerializingObject
+class LMMS_EXPORT Note : public SerializingObject
 {
 public:
 	Note( const MidiTime & length = MidiTime( 0 ),

include/NotePlayHandle.h

@@ -42,7 +42,7 @@ typedef QList<NotePlayHandle *> NotePlayHandleList;
 typedef QList<const NotePlayHandle *> ConstNotePlayHandleList;
 
 
-class EXPORT NotePlayHandle : public PlayHandle, public Note
+class LMMS_EXPORT NotePlayHandle : public PlayHandle, public Note
 {
 	MM_OPERATORS
 public:

include/Oscillator.h

@@ -39,7 +39,7 @@
 class IntModel;
 
 
-class EXPORT Oscillator
+class LMMS_EXPORT Oscillator
 {
 	MM_OPERATORS
 public:

include/Pattern.h

@@ -46,7 +46,7 @@ class SampleBuffer;
 
 
 
-class EXPORT Pattern : public TrackContentObject
+class LMMS_EXPORT Pattern : public TrackContentObject
 {
 	Q_OBJECT
 public:

include/PeakController.h

@@ -36,7 +36,7 @@ class PeakControllerEffect;
 typedef QVector<PeakControllerEffect *> PeakControllerEffectVector;
 
 
-class EXPORT PeakController : public Controller
+class LMMS_EXPORT PeakController : public Controller
 {
 	Q_OBJECT
 public:

include/PixmapButton.h

@@ -31,7 +31,7 @@
 #include "AutomatableButton.h"
 
 
-class EXPORT PixmapButton : public AutomatableButton
+class LMMS_EXPORT PixmapButton : public AutomatableButton
 {
 	Q_OBJECT
 public:

include/PlayHandle.h

@@ -28,7 +28,7 @@
 #include <QtCore/QList>
 #include <QtCore/QMutex>
 
-#include "export.h"
+#include "lmms_export.h"
 
 #include "MemoryManager.h"
 
@@ -40,7 +40,7 @@ class QThread;
 class Track;
 class AudioPort;
 
-class EXPORT PlayHandle : public ThreadableJob
+class LMMS_EXPORT PlayHandle : public ThreadableJob
 {
 public:
 	enum Types

include/Plugin.h

@@ -41,7 +41,7 @@ class PluginView;
 class AutomatableModel;
 
 
-class EXPORT Plugin : public Model, public JournallingObject
+class LMMS_EXPORT Plugin : public Model, public JournallingObject
 {
 	MM_OPERATORS
 	Q_OBJECT
@@ -78,7 +78,7 @@ public:
 			return QString( supportedFileTypes ).split( QChar( ',' ) ).contains( extension );
 		}
 
-		class EXPORT SubPluginFeatures
+		class LMMS_EXPORT SubPluginFeatures
 		{
 		public:
 			struct Key

include/PluginFactory.h

@@ -31,12 +31,12 @@
 #include <QtCore/QHash>
 #include <QtCore/QList>
 
-#include "export.h"
+#include "lmms_export.h"
 #include "Plugin.h"
 
 class QLibrary;
 
-class EXPORT PluginFactory
+class LMMS_EXPORT PluginFactory
 {
 public:
 	struct PluginInfo

include/PluginView.h

@@ -31,7 +31,7 @@
 #include "ModelView.h"
 
 
-class EXPORT PluginView  : public QWidget, public ModelView
+class LMMS_EXPORT PluginView  : public QWidget, public ModelView
 {
 public:
 	PluginView( Plugin * _plugin, QWidget * _parent ) :

include/PresetPreviewPlayHandle.h

@@ -32,7 +32,7 @@
 class InstrumentTrack;
 class PreviewTrackContainer;
 
-class EXPORT PresetPreviewPlayHandle : public PlayHandle
+class LMMS_EXPORT PresetPreviewPlayHandle : public PlayHandle
 {
 public:
 	PresetPreviewPlayHandle( const QString& presetFile, bool loadByPlugin = false, DataFile *dataFile = 0 );

include/ProjectNotes.h

@@ -37,7 +37,7 @@ class QTextCharFormat;
 class QTextEdit;
 
 
-class EXPORT ProjectNotes : public QMainWindow, public SerializingObject
+class LMMS_EXPORT ProjectNotes : public QMainWindow, public SerializingObject
 {
 	Q_OBJECT
 public:

include/ProjectRenderer.h

@@ -30,8 +30,9 @@
 #include "Mixer.h"
 #include "OutputSettings.h"
 
+#include "lmms_export.h"
 
-class ProjectRenderer : public QThread
+class LMMS_EXPORT ProjectRenderer : public QThread
 {
 	Q_OBJECT
 public:

include/RemotePlugin.h

@@ -25,7 +25,7 @@
 #ifndef REMOTE_PLUGIN_H
 #define REMOTE_PLUGIN_H
 
-#include "export.h"
+#include "lmms_export.h"
 #include "MidiEvent.h"
 #include "VstSyncData.h"
 
@@ -79,8 +79,8 @@ typedef int32_t key_t;
 
 
 #ifdef BUILD_REMOTE_PLUGIN_CLIENT
-#undef EXPORT
-#define EXPORT
+#undef LMMS_EXPORT
+#define LMMS_EXPORT
 #define COMPILE_REMOTE_PLUGIN_BASE
 
 #ifndef SYNC_WITH_SHM_FIFO
@@ -444,7 +444,7 @@ enum RemoteMessageIDs
 
 
 
-class EXPORT RemotePluginBase
+class LMMS_EXPORT RemotePluginBase
 {
 public:
 	struct message
@@ -768,7 +768,7 @@ private:
 } ;
 
 
-class EXPORT RemotePlugin : public QObject, public RemotePluginBase
+class LMMS_EXPORT RemotePlugin : public QObject, public RemotePluginBase
 {
 	Q_OBJECT
 public:

include/RingBuffer.h

@@ -32,7 +32,7 @@
 #include "lmms_math.h"
 #include "MemoryManager.h"
 
-class EXPORT RingBuffer : public QObject
+class LMMS_EXPORT RingBuffer : public QObject
 {
 	Q_OBJECT
 	MM_OPERATORS

include/SampleBuffer.h

@@ -31,7 +31,7 @@
 
 #include <samplerate.h>
 
-#include "export.h"
+#include "lmms_export.h"
 #include "interpolation.h"
 #include "lmms_basics.h"
 #include "lmms_math.h"
@@ -48,7 +48,7 @@ class QRect;
 // may need to be higher - conversely, to optimize, some may work with lower values
 const f_cnt_t MARGIN[] = { 64, 64, 64, 4, 4 };
 
-class EXPORT SampleBuffer : public QObject, public sharedObject
+class LMMS_EXPORT SampleBuffer : public QObject, public sharedObject
 {
 	Q_OBJECT
 	MM_OPERATORS
@@ -58,7 +58,7 @@ public:
 		LoopOn,
 		LoopPingPong
 	};
-	class EXPORT handleState
+	class LMMS_EXPORT handleState
 	{
 		MM_OPERATORS
 	public:

include/SerializingObject.h

@@ -27,7 +27,7 @@
 
 #include <QtCore/QString>
 
-#include "export.h"
+#include "lmms_export.h"
 
 
 class QDomDocument;
@@ -36,7 +36,7 @@ class QDomElement;
 class SerializingObjectHook;
 
 
-class EXPORT SerializingObject
+class LMMS_EXPORT SerializingObject
 {
 public:
 	SerializingObject();

include/Song.h

@@ -48,7 +48,7 @@ const bpm_t MaxTempo = 999;
 const tick_t MaxSongLength = 9999 * DefaultTicksPerTact;
 
 
-class EXPORT Song : public TrackContainer
+class LMMS_EXPORT Song : public TrackContainer
 {
 	Q_OBJECT
 	mapPropertyFromModel( int,getTempo,setTempo,m_tempoModel );

include/StringPairDrag.h

@@ -31,12 +31,12 @@
 #include <QDropEvent>
 #include <QMimeData>
 
-#include "export.h"
+#include "lmms_export.h"
 
 class QPixmap;
 
 
-class EXPORT StringPairDrag : public QDrag
+class LMMS_EXPORT StringPairDrag : public QDrag
 {
 public:
 	StringPairDrag( const QString & _key, const QString & _value,

include/SubWindow.h

@@ -34,7 +34,7 @@
 #include <QPushButton>
 #include <QString>
 
-#include "export.h"
+#include "lmms_export.h"
 
 class QMoveEvent;
 class QResizeEvent;
@@ -48,7 +48,7 @@ class QWidget;
  *  for cusomizing the title bar appearance, lmms implements its own subwindow
  *  class.
  */
-class EXPORT SubWindow : public QMdiSubWindow
+class LMMS_EXPORT SubWindow : public QMdiSubWindow
 {
 	Q_OBJECT
 	Q_PROPERTY( QBrush activeColor READ activeColor WRITE setActiveColor )

include/TabBar.h

@@ -30,13 +30,13 @@
 #include <QLayout>
 #include <QWidget>
 
-#include "export.h"
+#include "lmms_export.h"
 
 
 class TabButton;
 
 
-class EXPORT TabBar : public QWidget
+class LMMS_EXPORT TabBar : public QWidget
 {
 	Q_OBJECT
 public:

include/TempoSyncKnob.h

@@ -34,7 +34,7 @@
 
 class MeterDialog;
 
-class EXPORT TempoSyncKnob : public Knob
+class LMMS_EXPORT TempoSyncKnob : public Knob
 {
 	Q_OBJECT
 public:

include/TempoSyncKnobModel.h

@@ -30,7 +30,7 @@
 
 class QAction;
 
-class EXPORT TempoSyncKnobModel : public FloatModel
+class LMMS_EXPORT TempoSyncKnobModel : public FloatModel
 {
 	Q_OBJECT
 public:

include/TextFloat.h

@@ -29,10 +29,10 @@
 #include <QWidget>
 #include <QPixmap>
 
-#include "export.h"
+#include "lmms_export.h"
 
 
-class EXPORT TextFloat : public QWidget
+class LMMS_EXPORT TextFloat : public QWidget
 {
 	Q_OBJECT
 public:

include/ToolPlugin.h

@@ -29,7 +29,7 @@
 
 #include "Plugin.h"
 
-class EXPORT ToolPlugin : public Plugin
+class LMMS_EXPORT ToolPlugin : public Plugin
 {
 public:
 	ToolPlugin( const Descriptor * _descriptor, Model * _parent );

include/ToolPluginView.h

@@ -30,7 +30,7 @@
 
 class ToolPlugin;
 
-class EXPORT ToolPluginView : public PluginView
+class LMMS_EXPORT ToolPluginView : public PluginView
 {
 public:
 	ToolPluginView( ToolPlugin * _toolPlugin );

include/ToolTip.h

@@ -28,14 +28,14 @@
 
 #include <qstring.h>
 
-#include "export.h"
+#include "lmms_export.h"
 
 class QWidget;
 
 
 struct ToolTip
 {
-	static void EXPORT add( QWidget * _w, const QString & _txt );
+	static void LMMS_EXPORT add( QWidget * _w, const QString & _txt );
 } ;
 
 

include/Track.h

@@ -463,7 +463,7 @@ signals:
 
 
 // base-class for all tracks
-class EXPORT Track : public Model, public JournallingObject
+class LMMS_EXPORT Track : public Model, public JournallingObject
 {
 	Q_OBJECT
 	MM_OPERATORS

include/TrackContainer.h

@@ -37,7 +37,7 @@ class InstrumentTrack;
 class TrackContainerView;
 
 
-class EXPORT TrackContainer : public Model, public JournallingObject
+class LMMS_EXPORT TrackContainer : public Model, public JournallingObject
 {
 	Q_OBJECT
 public:

include/ValueBuffer.h

@@ -29,9 +29,9 @@
 #include <vector>
 
 #include "MemoryManager.h"
-#include "export.h"
+#include "lmms_export.h"
 
-class EXPORT ValueBuffer : public std::vector<float>
+class LMMS_EXPORT ValueBuffer : public std::vector<float>
 {
 	MM_OPERATORS
 public:

include/embed.h

@@ -28,15 +28,15 @@
 #include <QPixmap>
 #include <QtCore/QString>
 
-#include "export.h"
+#include "lmms_export.h"
 #include "lmms_basics.h"
 
 
 namespace embed
 {
 
-QPixmap EXPORT getIconPixmap( const QString&  _name, int _w = -1, int _h = -1 );
-QString EXPORT getText( const char * _name );
+QPixmap LMMS_EXPORT getIconPixmap( const QString&  _name, int _w = -1, int _h = -1 );
+QString LMMS_EXPORT getText( const char * _name );
 
 }
 

include/export.h

@@ -1,46 +0,0 @@
-/*
- * export.h - macros for export-declarations
- *
- * Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- *
- * This file is part of LMMS - https://lmms.io
- *
- * 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 (see COPYING); if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA.
- *
- */
-
-#ifndef EXPORT_H
-#define EXPORT_H
-
-#include "lmmsconfig.h"
-
-#ifdef LMMS_BUILD_WIN32
-
-#ifdef PLUGIN_NAME
-#define EXPORT __declspec(dllimport)
-#define PLUGIN_EXPORT __declspec(dllexport)
-#else
-#define EXPORT __declspec(dllexport)
-#endif
-
-#else
-
-#define EXPORT
-#define PLUGIN_EXPORT
-
-#endif
-
-#endif

include/fft_helpers.h

@@ -26,7 +26,7 @@
 #ifndef FFT_HELPERS_H
 #define FFT_HELPERS_H
 
-#include "export.h"
+#include "lmms_export.h"
 
 #include <fftw3.h>
 
@@ -44,13 +44,13 @@ enum WINDOWS
  *
  *    returns -1 on error
  */
-float EXPORT maximum( float * _abs_spectrum, unsigned int _spec_size );
+float LMMS_EXPORT maximum( float * _abs_spectrum, unsigned int _spec_size );
 
 /* apply hanning or hamming window to channel
  *
  *    returns -1 on error
  */
-int EXPORT hanming( float * _timebuffer, int _length, WINDOWS _type );
+int LMMS_EXPORT hanming( float * _timebuffer, int _length, WINDOWS _type );
 
 /* compute absolute values of complex_buffer, save to absspec_buffer
  * take care that - compl_len is not bigger than complex_buffer!
@@ -58,7 +58,7 @@ int EXPORT hanming( float * _timebuffer, int _length, WINDOWS _type );
  *
  *    returns 0 on success, else -1
  */
-int EXPORT absspec( fftwf_complex * _complex_buffer, float * _absspec_buffer,
+int LMMS_EXPORT absspec( fftwf_complex * _complex_buffer, float * _absspec_buffer,
 							int _compl_length );
 
 /* build fewer subbands from many absolute spectrum values
@@ -67,11 +67,11 @@ int EXPORT absspec( fftwf_complex * _complex_buffer, float * _absspec_buffer,
  *
  *    returns 0 on success, else -1
  */
-int EXPORT compressbands( float * _absspec_buffer, float * _compressedband,
+int LMMS_EXPORT compressbands( float * _absspec_buffer, float * _compressedband,
 			int _num_old, int _num_new, int _bottom, int _top );
 
 
-int EXPORT calc13octaveband31( float * _absspec_buffer, float * _subbands,
+int LMMS_EXPORT calc13octaveband31( float * _absspec_buffer, float * _subbands,
 				int _num_spec, float _max_frequency );
 
 /* compute power of finite time sequence
@@ -79,6 +79,6 @@ int EXPORT calc13octaveband31( float * _absspec_buffer, float * _subbands,
  *
  *    returns power on success, else -1
  */
-float EXPORT signalpower(float *timesignal, int num_values);
+float LMMS_EXPORT signalpower(float *timesignal, int num_values);
 
 #endif

plugins/Amplifier/Amplifier.cpp

@@ -26,7 +26,7 @@
 #include "Amplifier.h"
 
 #include "embed.h"
-
+#include "plugin_export.h"
 
 extern "C"
 {

plugins/BassBooster/BassBooster.cpp

@@ -25,7 +25,7 @@
 #include "BassBooster.h"
 
 #include "embed.h"
-
+#include "plugin_export.h"
 
 extern "C"
 {

plugins/Bitcrush/Bitcrush.cpp

@@ -25,6 +25,7 @@
 
 #include "Bitcrush.h"
 #include "embed.h"
+#include "plugin_export.h"
 
 const int OS_RATE = 5;
 const float OS_RATIO = 1.0f / OS_RATE;

plugins/CrossoverEQ/CrossoverEQ.cpp

@@ -27,6 +27,7 @@
 #include "CrossoverEQ.h"
 #include "lmms_math.h"
 #include "embed.h"
+#include "plugin_export.h"
 
 extern "C"
 {

plugins/Delay/DelayEffect.cpp

@@ -26,7 +26,7 @@
 #include "Engine.h"
 #include "embed.h"
 #include "interpolation.h"
-
+#include "plugin_export.h"
 
 extern "C"
 {

plugins/DualFilter/DualFilter.cpp

@@ -27,7 +27,7 @@
 
 #include "embed.h"
 #include "BasicFilters.h"
-
+#include "plugin_export.h"
 
 extern "C"
 {

plugins/Eq/EqEffect.cpp

@@ -24,12 +24,13 @@
 
 #include "EqEffect.h"
 
-#include "embed.h"
 #include "Engine.h"
 #include "EqFader.h"
 #include "interpolation.h"
 #include "lmms_math.h"
 
+#include "embed.h"
+#include "plugin_export.h"
 
 extern "C"
 {

plugins/Flanger/FlangerEffect.cpp

@@ -24,7 +24,9 @@
 
 #include "FlangerEffect.h"
 #include "Engine.h"
+
 #include "embed.h"
+#include "plugin_export.h"
 
 extern "C"
 {

plugins/FreeBoy/FreeBoy.cpp

@@ -42,6 +42,8 @@
 
 #include "embed.h"
 
+#include "plugin_export.h"
+
 const blip_time_t FRAME_LENGTH = 70224;
 const long CLOCK_RATE = 4194304;
 

plugins/HydrogenImport/HydrogenImport.cpp

@@ -19,6 +19,8 @@
 #include "BBTrackContainer.h"
 #include "Instrument.h"
 
+#include "plugin_export.h"
+
 #define MAX_LAYERS 4
 extern "C"
 {

plugins/MidiExport/MidiExport.cpp

@@ -37,6 +37,7 @@
 #include "BBTrack.h"
 #include "InstrumentTrack.h"
 
+#include "plugin_export.h"
 
 extern "C"
 {

plugins/MidiImport/MidiImport.cpp

@@ -44,9 +44,11 @@
 #include "MainWindow.h"
 #include "MidiTime.h"
 #include "debug.h"
-#include "embed.h"
 #include "Song.h"
 
+#include "embed.h"
+#include "plugin_export.h"
+
 #include "portsmf/allegro.h"
 
 #define makeID(_c0, _c1, _c2, _c3) \

plugins/MultitapEcho/MultitapEcho.cpp

@@ -25,7 +25,7 @@
 
 #include "MultitapEcho.h"
 #include "embed.h"
-
+#include "plugin_export.h"
 
 extern "C"
 {

plugins/OpulenZ/OpulenZ.cpp

@@ -59,6 +59,8 @@
 #include "PixmapButton.h"
 #include "ToolTip.h"
 
+#include "plugin_export.h"
+
 extern "C"
 {
 

plugins/SpectrumAnalyzer/SpectrumAnalyzer.cpp

@@ -25,7 +25,7 @@
 #include "SpectrumAnalyzer.h"
 
 #include "embed.h"
-
+#include "plugin_export.h"
 
 extern "C"
 {

plugins/audio_file_processor/audio_file_processor.cpp

@@ -45,7 +45,7 @@
 #include "DataFile.h"
 
 #include "embed.h"
-
+#include "plugin_export.h"
 
 extern "C"
 {

plugins/bit_invader/bit_invader.cpp

@@ -43,6 +43,8 @@
 
 #include "embed.h"
 
+#include "plugin_export.h"
+
 extern "C"
 {