X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmsvc_libardour.h;h=f8edcdd3cb098c58176bf961b7b26df538f74030;hb=04c56a0618f668fac288fb2070fcf200a83aebc6;hp=75c932905eaec998e6d4cca31109dcc7b509f144;hpb=2a6a16f980ff9181b138f7a30aedfbde4426a591;p=ardour.git

diff --git a/libs/ardour/ardour/msvc_libardour.h b/libs/ardour/ardour/msvc_libardour.h
index 75c932905e..f8edcdd3cb 100644
--- a/libs/ardour/ardour/msvc_libardour.h
+++ b/libs/ardour/ardour/msvc_libardour.h
@@ -19,37 +19,9 @@
 #ifndef __msvc_libardour_h__
 #define __msvc_libardour_h__
 
+#include <ardour/libardour_visibility.h>
 #include <limits.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_API __declspec(dllexport)
-		#define LIBARDOUR_APICALLTYPE __stdcall
-	#elif defined(COMPILER_MSVC) || defined(COMPILER_MINGW) // Probably needs Cygwin too, at some point
-		#define LIBARDOUR_API __declspec(dllimport)
-		#define LIBARDOUR_APICALLTYPE __stdcall
-	#else
-		#error "Attempting to define __declspec with an incompatible compiler !"
-	#endif
-#elif !defined(LIBARDOUR_API)
-	// Other compilers / platforms could be accommodated here
-	#define LIBARDOUR_API
-	#define LIBARDOUR_APICALLTYPE
-#endif
-
 #ifndef _MAX_PATH
 #define _MAX_PATH  260
 #endif
@@ -57,6 +29,8 @@
 #define  PATH_MAX _MAX_PATH
 #endif
 
+#define LIBARDOUR_APICALLTYPE __cdecl
+
 namespace ARDOUR {
 
 #ifdef __cplusplus