diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-10 16:07:57 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-10 16:07:57 -0500 |
| commit | 3020b224fa2d6e1b6b8a576e8e8e211e0585f2a2 (patch) | |
| tree | 314c3099bcc57d9af09d249e1e7dd8e45baca642 /libs/panners/2in2out | |
| parent | d15fda6d751a465d278f477923075d4783f3b1ca (diff) | |
| parent | 897fbdc652434d3aa1e67223c3c3ef7ae9be2318 (diff) | |
Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there
Diffstat (limited to 'libs/panners/2in2out')
| -rw-r--r-- | libs/panners/2in2out/panner_2in2out.cc | 2 | ||||
| -rw-r--r-- | libs/panners/2in2out/wscript | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libs/panners/2in2out/panner_2in2out.cc b/libs/panners/2in2out/panner_2in2out.cc index f801a36ff4..a10c4adc29 100644 --- a/libs/panners/2in2out/panner_2in2out.cc +++ b/libs/panners/2in2out/panner_2in2out.cc @@ -70,7 +70,7 @@ static PanPluginDescriptor _descriptor = { Panner2in2out::factory }; -extern "C" { PanPluginDescriptor* panner_descriptor () { return &_descriptor; } } +extern "C" ARDOURPANNER_API PanPluginDescriptor* panner_descriptor () { return &_descriptor; } Panner2in2out::Panner2in2out (boost::shared_ptr<Pannable> p) : Panner (p) diff --git a/libs/panners/2in2out/wscript b/libs/panners/2in2out/wscript index 4d144b1934..63f029f287 100644 --- a/libs/panners/2in2out/wscript +++ b/libs/panners/2in2out/wscript @@ -22,7 +22,8 @@ def build(bld): obj = bld(features = 'cxx cxxshlib') obj.source = [ 'panner_2in2out.cc' ] obj.export_includes = ['.'] - obj.defines = [ 'PACKAGE="libardour_pan2in2out"' ] + obj.defines = [ 'PACKAGE="libardour_pan2in2out"' ] + obj.defines += [ 'ARDOURPANNER_DLL_EXPORTS' ] obj.includes = ['.'] obj.name = 'libardour_pan2in2out' obj.target = 'pan2in2out' |