From e2e057ce598f82a8d47fdb1bc498cd2a6408704b Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 16 Oct 2013 23:30:52 -0400 Subject: make small beginning on visibility control in libardour --- libs/ardour/ardour/ardour.h | 1 + libs/ardour/ardour/libardour_visibility.h | 58 +++++++++++++++++++++++++++++++ libs/ardour/ardour/session.h | 2 +- libs/ardour/wscript | 3 +- 4 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 libs/ardour/ardour/libardour_visibility.h diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h index 80bdf9d80e..f65725d209 100644 --- a/libs/ardour/ardour/ardour.h +++ b/libs/ardour/ardour/ardour.h @@ -35,6 +35,7 @@ #include "pbd/stateful.h" #include "ardour/types.h" +#include "ardour/libardour_visibility.h" #include diff --git a/libs/ardour/ardour/libardour_visibility.h b/libs/ardour/ardour/libardour_visibility.h new file mode 100644 index 0000000000..ae07961ef3 --- /dev/null +++ b/libs/ardour/ardour/libardour_visibility.h @@ -0,0 +1,58 @@ +/* + Copyright (C) 2013 Paul Davis + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#ifndef __libardour_libardour_visibility_h__ +#define __libardour_libardour_visibility_h__ + +/* _WIN32 is defined by most compilers targetting Windows, but within the + * ardour source tree, we also define COMPILER_MSVC or COMPILER_MINGW depending + * on how a Windows build is built. + */ + +#if defined _WIN32 || defined __CYGWIN__ || defined(COMPILER_MSVC) || defined(COMPILER_MINGW) + #define LIBARDOUR_DLL_IMPORT __declspec(dllimport) + #define LIBARDOUR_DLL_EXPORT __declspec(dllexport) + #define LIBARDOUR_DLL_LOCAL +#else + #if __GNUC__ >= 4 + #define LIBARDOUR_DLL_IMPORT __attribute__ ((visibility ("default"))) + #define LIBARDOUR_DLL_EXPORT __attribute__ ((visibility ("default"))) + #define LIBARDOUR_DLL_LOCAL __attribute__ ((visibility ("hidden"))) + #else + #define LIBARDOUR_DLL_IMPORT + #define LIBARDOUR_DLL_EXPORT + #define LIBARDOUR_DLL_LOCAL + #define LIBARDOUR_DLL_IMPORT_CLASS + #define LIBARDOUR_DLL_EXPORT_CLASS + #endif +#endif + +#ifdef LIBARDOUR_DLL // libardour is a DLL +#ifdef LIBARDOUR_DLL_EXPORTS // defined if we are building the libardour DLL (instead of using it) + #define LIBARDOUR_API LIBARDOUR_DLL_EXPORT +#else + #define LIBARDOUR_API LIBARDOUR_DLL_IMPORT +#endif +#define LIBARDOUR_LOCAL LIBARDOUR_DLL_LOCAL +#else /* static lib, not DLL */ +#define LIBARDOUR_API +#define LIBARDOUR_LOCAL +#endif + +#endif /* __libardour_libardour_visibility_h__ */ diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 9c4edfa1a1..0f4e04715a 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -140,7 +140,7 @@ class WindowsVSTPlugin; extern void setup_enum_writer (); -class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionList, public SessionEventManager +class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionList, public SessionEventManager { public: enum RecordState { diff --git a/libs/ardour/wscript b/libs/ardour/wscript index e91d019dd5..1adc131332 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -344,7 +344,8 @@ def build(bld): 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', 'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"', 'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"', - 'EVORAL_MIDI_XML=1' + 'EVORAL_MIDI_XML=1', + 'LIBARDOUR_DLL_EXPORTS=1' ] #obj.source += ' st_stretch.cc st_pitch.cc ' -- cgit v1.2.3