From a94dadc7595ef92a47be63fd23dd3f6a2ee0d24a Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 12 Jan 2014 19:59:40 -0500 Subject: [PATCH] add LIBEVORAL_TEMPLATE_API to deal with gcc/msvc difference of opinion --- libs/evoral/evoral/visibility.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/evoral/evoral/visibility.h b/libs/evoral/evoral/visibility.h index fc6d23a401..7f4a898875 100644 --- a/libs/evoral/evoral/visibility.h +++ b/libs/evoral/evoral/visibility.h @@ -24,10 +24,14 @@ #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 #else #define LIBEVORAL_DLL_IMPORT __attribute__ ((visibility ("default"))) #define LIBEVORAL_DLL_EXPORT __attribute__ ((visibility ("default"))) #define LIBEVORAL_DLL_LOCAL __attribute__ ((visibility ("hidden"))) + #define LIBEVORAL_TEMPLATE_DLL_IMPORT __attribute__ ((visibility ("default"))) + #define LIBEVORAL_TEMPLATE_DLL_EXPORT __attribute__ ((visibility ("default"))) #endif #ifdef LIBEVORAL_STATIC // libevoral is not a DLL @@ -36,8 +40,10 @@ #else #ifdef LIBEVORAL_DLL_EXPORTS // defined if we are building the libevoral DLL (instead of using it) #define LIBEVORAL_API LIBEVORAL_DLL_EXPORT + #define LIBEVORAL_TEMPLATE_API LIBEVORAL_TEMPLATE_DLL_EXPORT #else #define LIBEVORAL_API LIBEVORAL_DLL_IMPORT + #define LIBEVORAL_TEMPLATE_API LIBEVORAL_TEMPLATE_DLL_IMPORT #endif #define LIBEVORAL_LOCAL LIBEVORAL_DLL_LOCAL #endif