diff options
author | John Emmas <johne53@tiscali.co.uk> | 2014-01-20 17:51:53 +0000 |
---|---|---|
committer | John Emmas <johne53@tiscali.co.uk> | 2014-01-20 17:51:53 +0000 |
commit | bd16d6afeadc4fc222c3fca1a10911e090912856 (patch) | |
tree | c1d1a39e99b2cfb45ac271cfd54b0a8cfa5c8095 /libs | |
parent | b5e9e7c04c6f0514dcdf3be8e02eb1ce75dd8fb8 (diff) |
I thought I'd committed these changes to 'windows+cc' but I must have forgot....
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/ardour/ardour.h | 2 | ||||
-rw-r--r-- | libs/ardour/ardour/revision.h | 2 | ||||
-rw-r--r-- | libs/ardour/ardour/visibility.h | 73 |
3 files changed, 2 insertions, 75 deletions
diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h index 5e747f5665..f21d62c6b7 100644 --- a/libs/ardour/ardour/ardour.h +++ b/libs/ardour/ardour/ardour.h @@ -68,7 +68,7 @@ namespace ARDOUR { extern LIBARDOUR_API PBD::PropertyChange bounds_change; - extern /*LIBARDOUR_API*/ const char* const ardour_config_info; + extern LIBARDOUR_API const char* const ardour_config_info; LIBARDOUR_API void find_bindings_files (std::map<std::string,std::string>&); diff --git a/libs/ardour/ardour/revision.h b/libs/ardour/ardour/revision.h index 7374c0839b..ed4059cbf9 100644 --- a/libs/ardour/ardour/revision.h +++ b/libs/ardour/ardour/revision.h @@ -24,7 +24,7 @@ namespace ARDOUR { - /*LIBARDOUR_API extern*/ extern const char* revision; + LIBARDOUR_API extern const char* revision; extern "C" { LIBARDOUR_API const char* get_ardour_revision(); diff --git a/libs/ardour/ardour/visibility.h b/libs/ardour/ardour/visibility.h deleted file mode 100644 index 7f79dd6f2e..0000000000 --- a/libs/ardour/ardour/visibility.h +++ /dev/null @@ -1,73 +0,0 @@ -/* - 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_visibility_h__ -#define __libardour_visibility_h__ - -#include "ardour/libardour_visibility.h" - -#ifdef LIBARDOUR_IS_IN_WIN_STATIC_LIB // #define if your project uses libardour (under Windows) as a static library -#define LIBARDOUR_IS_IN_WINDLL 0 -#endif - -#if !defined(LIBARDOUR_IS_IN_WINDLL) - #if defined(COMPILER_MSVC) || defined(COMPILER_MINGW) - // If you need '__declspec' compatibility, add extra compilers to the above as necessary - #define LIBARDOUR_IS_IN_WINDLL 1 - #else - #define LIBARDOUR_IS_IN_WINDLL 0 - #endif -#endif - -#if LIBARDOUR_IS_IN_WINDLL && !defined(LIBARDOUR_API) - #if defined(BUILDING_LIBARDOUR) - #define LIBARDOUR_APICALLTYPE __cdecl - #elif defined(COMPILER_MSVC) || defined(COMPILER_MINGW) // Probably needs Cygwin too, at some point - #define LIBARDOUR_APICALLTYPE __cdecl - #else - #error "Attempting to define __declspec with an incompatible compiler !" - #endif -#elif !defined(LIBARDOUR_APICALLTYPE) - // Other compilers / platforms could be accommodated here (as an example, see LIBARDOUR_HELPER_DLL, below) - #define LIBARDOUR_APICALLTYPE -#endif - - -/* _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_HELPER_DLL_IMPORT __declspec(dllimport) - #define LIBARDOUR_HELPER_DLL_EXPORT __declspec(dllexport) - #define LIBARDOUR_HELPER_DLL_LOCAL -#else - #if __GNUC__ >= 4 - #define LIBARDOUR_HELPER_DLL_IMPORT __attribute__ ((visibility ("default"))) - #define LIBARDOUR_HELPER_DLL_EXPORT __attribute__ ((visibility ("default"))) - #define LIBARDOUR_HELPER_DLL_LOCAL __attribute__ ((visibility ("hidden"))) - #else - #define LIBARDOUR_HELPER_DLL_IMPORT - #define LIBARDOUR_HELPER_DLL_EXPORT - #define LIBARDOUR_HELPER_DLL_LOCAL - #endif -#endif - -#endif /* __libardour_visibility_h__ */ |