diff options
author | John Emmas <johne53@tiscali.co.uk> | 2014-03-21 18:57:36 +0000 |
---|---|---|
committer | John Emmas <johne53@tiscali.co.uk> | 2014-03-21 18:57:36 +0000 |
commit | 34ebb682a4ecbe212d2e57e651622429331c7274 (patch) | |
tree | 9cc06f8877134e0dafc628bd2694c074ecffc866 | |
parent | abab819bb361efc71a090650570f08bf5495c826 (diff) |
Minor visibility changes to libevoral (template objects can be exported in libevoral because they're always instantiated in the actual DLL).
-rw-r--r-- | libs/evoral/evoral/Note.hpp | 4 | ||||
-rw-r--r-- | libs/evoral/evoral/visibility.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libs/evoral/evoral/Note.hpp b/libs/evoral/evoral/Note.hpp index e84d6b9dc4..5401271621 100644 --- a/libs/evoral/evoral/Note.hpp +++ b/libs/evoral/evoral/Note.hpp @@ -33,7 +33,11 @@ namespace Evoral { * Currently a note is defined as (on event, length, off event). */ template<typename Time> +#ifdef COMPILER_MSVC +class LIBEVORAL_LOCAL Note { +#else class LIBEVORAL_TEMPLATE_API Note { +#endif public: Note(uint8_t chan=0, Time time=0, Time len=0, uint8_t note=0, uint8_t vel=0x40); Note(const Note<Time>& copy); diff --git a/libs/evoral/evoral/visibility.h b/libs/evoral/evoral/visibility.h index 7f4a898875..dd4fe1ff64 100644 --- a/libs/evoral/evoral/visibility.h +++ b/libs/evoral/evoral/visibility.h @@ -24,8 +24,8 @@ #define LIBEVORAL_DLL_IMPORT __declspec(dllimport) #define LIBEVORAL_DLL_EXPORT __declspec(dllexport) #define LIBEVORAL_DLL_LOCAL - #define LIBEVORAL_TEMPLATE_DLL_IMPORT - #define LIBEVORAL_TEMPLATE_DLL_EXPORT + #define LIBEVORAL_TEMPLATE_DLL_IMPORT __declspec(dllimport) + #define LIBEVORAL_TEMPLATE_DLL_EXPORT __declspec(dllexport) #else #define LIBEVORAL_DLL_IMPORT __attribute__ ((visibility ("default"))) #define LIBEVORAL_DLL_EXPORT __attribute__ ((visibility ("default"))) |