hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix Linux compilation issues caused by MSVC fixes

Browse Source
This commit is contained in:
Lukas W
2017-11-22 16:09:55 +01:00
parent 313d43bc16
commit 852708863a
11 changed files with 20 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/BasicFilters.h
View File

@@ -44,7 +44,7 @@
#include "interpolation.h"
#include "MemoryManager.h"
template<ch_cnt_t CHANNELS> class BasicFilters;
template<ch_cnt_t CHANNELS=DEFAULT_CHANNELS> class BasicFilters;
template<ch_cnt_t CHANNELS>
class LinkwitzRiley
@@ -218,7 +218,7 @@ private:
};
typedef OnePole<2> StereoOnePole;
template<ch_cnt_t CHANNELS=DEFAULT_CHANNELS>
template<ch_cnt_t CHANNELS>
class BasicFilters
{
MM_OPERATORS

2
include/NotePlayHandle.h
View File

@@ -27,6 +27,7 @@
#define NOTE_PLAY_HANDLE_H
#include "AtomicInt.h"
#include "BasicFilters.h"
#include "Note.h"
#include "PlayHandle.h"
#include "Track.h"
@@ -36,7 +37,6 @@ class QReadWriteLock;
class InstrumentTrack;
class NotePlayHandle;
template<ch_cnt_t=DEFAULT_CHANNELS> class BasicFilters;
typedef QList<NotePlayHandle *> NotePlayHandleList;
typedef QList<const NotePlayHandle *> ConstNotePlayHandleList;

8
include/export.h
View File

@@ -22,8 +22,6 @@
*
*/
#include <QtCore/QtGlobal>
#ifndef EXPORT_H
#define EXPORT_H
@@ -32,10 +30,10 @@
#ifdef LMMS_BUILD_WIN32
#ifdef PLUGIN_NAME
#define EXPORT Q_DECL_IMPORT
#define PLUGIN_EXPORT Q_DECL_EXPORT
#define EXPORT __declspec(dllimport)
#define PLUGIN_EXPORT __declspec(dllexport)
#else
#define EXPORT Q_DECL_EXPORT
#define EXPORT __declspec(dllexport)
#endif
#else