diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-18 11:50:44 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-18 11:50:44 -0400 |
| commit | f85c67501c2bef578eeb53741d0dfecaa0c723df (patch) | |
| tree | 2704e1cbf2ed747c996bb48b1433298e62d4e331 /libs/audiographer | |
| parent | 683496c501641fb5d7d47bdf9064aed72755ca61 (diff) | |
reverse the visibility.h files assumptions that we don't build shared libs by default
This avoids having to define define LIBFOO_DLL=1 all over the place. If we ever go with static libs we will
need to define LIBFOO_STATIC=1 but hopefully in some central location like the top level wscript.
Oh, and I also dropped support for gcc older than version 4.x because ardour will already not build
on such an old version.
Diffstat (limited to 'libs/audiographer')
| -rw-r--r-- | libs/audiographer/audiographer/visibility.h | 28 | ||||
| -rw-r--r-- | libs/audiographer/wscript | 4 |
2 files changed, 12 insertions, 20 deletions
diff --git a/libs/audiographer/audiographer/visibility.h b/libs/audiographer/audiographer/visibility.h index 8c149f9efd..72ce50bd25 100644 --- a/libs/audiographer/audiographer/visibility.h +++ b/libs/audiographer/audiographer/visibility.h @@ -30,27 +30,21 @@ #define LIBAUDIOGRAPHER_DLL_EXPORT __declspec(dllexport) #define LIBAUDIOGRAPHER_DLL_LOCAL #else - #if __GNUC__ >= 4 - #define LIBAUDIOGRAPHER_DLL_IMPORT __attribute__ ((visibility ("default"))) - #define LIBAUDIOGRAPHER_DLL_EXPORT __attribute__ ((visibility ("default"))) - #define LIBAUDIOGRAPHER_DLL_LOCAL __attribute__ ((visibility ("hidden"))) - #else - #define LIBAUDIOGRAPHER_DLL_IMPORT - #define LIBAUDIOGRAPHER_DLL_EXPORT - #define LIBAUDIOGRAPHER_DLL_LOCAL - #endif + #define LIBAUDIOGRAPHER_DLL_IMPORT __attribute__ ((visibility ("default"))) + #define LIBAUDIOGRAPHER_DLL_EXPORT __attribute__ ((visibility ("default"))) + #define LIBAUDIOGRAPHER_DLL_LOCAL __attribute__ ((visibility ("hidden"))) #endif -#ifdef LIBAUDIOGRAPHER_DLL // libaudiographer is a DLL -#ifdef LIBAUDIOGRAPHER_DLL_EXPORTS // defined if we are building the libaudiographer DLL (instead of using it) - #define LIBAUDIOGRAPHER_API LIBAUDIOGRAPHER_DLL_EXPORT +#ifdef LIBAUDIOGRAPHER_STATIC // libaudiographer is not a DLL + #define LIBAUDIOGRAPHER_API + #define LIBAUDIOGRAPHER_LOCAL #else + #ifdef LIBAUDIOGRAPHER_DLL_EXPORTS // defined if we are building the libaudiographer DLL (instead of using it) + #define LIBAUDIOGRAPHER_API LIBAUDIOGRAPHER_DLL_EXPORT + #else #define LIBAUDIOGRAPHER_API LIBAUDIOGRAPHER_DLL_IMPORT -#endif -#define LIBAUDIOGRAPHER_LOCAL LIBAUDIOGRAPHER_DLL_LOCAL -#else /* static lib, not DLL */ -#define LIBAUDIOGRAPHER_API -#define LIBAUDIOGRAPHER_LOCAL + #endif + #define LIBAUDIOGRAPHER_LOCAL LIBAUDIOGRAPHER_DLL_LOCAL #endif #endif /* __libaudiographer_visibility_h__ */ diff --git a/libs/audiographer/wscript b/libs/audiographer/wscript index 9e2d1c4c3c..183b272518 100644 --- a/libs/audiographer/wscript +++ b/libs/audiographer/wscript @@ -67,9 +67,7 @@ def build(bld): if bld.is_defined ('INTERNAL_SHARED_LIBS'): audiographer = bld.shlib(features = 'c cxx cshlib cxxshlib', source=audiographer_sources) # macros for this shared library - audiographer.defines = [ 'LIBAUDIOGRAPHER_DLL=1', 'LIBAUDIOGRAPHER_DLL_EXPORTS=1' ] - # macros for this other internal shared libraries that we use - audiographer.defines += [ 'LIBPBD_DLL=1' ] + audiographer.defines = [ 'LIBAUDIOGRAPHER_DLL_EXPORTS=1' ] audiographer.cflags = [ '-fvisibility=hidden' ] audiographer.cxxflags = [ '-fvisibility=hidden' ] else: |