ardour/livetrax
13
0
Fork 0
Code

'libs/panners' - Add a conventional 'C' API call type to test building with MSVC

Browse Source
This commit is contained in:
John Emmas 2013-08-31 16:19:36 +01:00
parent 4a8cd4375d
commit a6c85286fe
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/ardour/ardour/panner.h
View File

@ -47,9 +47,11 @@
#if defined(BUILDING_ARDOURPANNERS)
#define ARDOURPANNER_API __declspec(dllexport)
#define ARDOURPANNER_APICALLTYPE __thiscall
#define ARDOURPANNER_CAPICALLTYPE __cdecl
#elif defined(COMPILER_MSVC) || defined(COMPILER_MINGW) // Probably needs Cygwin too, at some point
#define ARDOURPANNER_API __declspec(dllimport)
#define ARDOURPANNER_APICALLTYPE __thiscall
#define ARDOURPANNER_CAPICALLTYPE __cdecl
#else
#error "Attempting to define __declspec with an incompatible compiler !"
#endif
@ -57,6 +59,7 @@
// Other compilers / platforms could be accommodated here
#define ARDOURPANNER_API
#define ARDOURPANNER_APICALLTYPE
#define ARDOURPANNER_CAPICALLTYPE
#endif
namespace ARDOUR {

2
libs/panners/1in2out/panner_1in2out.cc
View File

@ -67,7 +67,7 @@ static PanPluginDescriptor _descriptor = {
Panner1in2out::factory
};
extern "C" { PanPluginDescriptor* panner_descriptor () { return &_descriptor; } }
extern "C" { ARDOURPANNER_API PanPluginDescriptor* ARDOURPANNER_CAPICALLTYPE panner_descriptor () { return &_descriptor; } }
Panner1in2out::Panner1in2out (boost::shared_ptr<Pannable> p)
: Panner (p)