From 79b7fb82f3a9f3e6426c96cea0d06269fbb862fa Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sat, 25 Jan 2014 13:57:28 -0500 Subject: try to get export/visibility and build conditionals right for surfaces/, once more --- libs/surfaces/wiimote/interface.cc | 2 +- libs/surfaces/wiimote/wscript | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'libs/surfaces/wiimote') diff --git a/libs/surfaces/wiimote/interface.cc b/libs/surfaces/wiimote/interface.cc index 8695facb8d..9a704e445e 100644 --- a/libs/surfaces/wiimote/interface.cc +++ b/libs/surfaces/wiimote/interface.cc @@ -61,5 +61,5 @@ static ControlProtocolDescriptor wiimote_descriptor = { destroy : delete_wiimote_protocol }; -extern "C" LIBCONTROLCP_API ControlProtocolDescriptor* protocol_descriptor () { return &wiimote_descriptor; } +extern "C" ARDOURSURFACE_API ControlProtocolDescriptor* protocol_descriptor () { return &wiimote_descriptor; } diff --git a/libs/surfaces/wiimote/wscript b/libs/surfaces/wiimote/wscript index e63713c855..8513a5be51 100644 --- a/libs/surfaces/wiimote/wscript +++ b/libs/surfaces/wiimote/wscript @@ -25,10 +25,10 @@ def build(bld): interface.cc ''' obj.export_includes = ['./wiimote'] - obj.defines = [ 'PACKAGE="ardour_wiimote"' ] + obj.defines = [ 'PACKAGE="ardour_wiimote"' ] + obj.defines += [ 'ARDOURSURFACE_DLL_EXPORTS' ] obj.includes = ['.', '../libs'] obj.name = 'libardour_wiimote' - obj.defines = [ 'ARDOURSURFACE_DLL_EXPORTS' ] obj.target = 'ardour_wiimote' obj.uselib = 'GTKMM CWIID' obj.use = 'libardour libardour_cp libgtkmm2ext' -- cgit v1.2.3