Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed Clang API export macros on Windows #1460

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions modules/juce_core/system/juce_StandardHeader.h
Original file line number Diff line number Diff line change
Expand Up @@ -143,15 +143,19 @@ JUCE_END_IGNORE_WARNINGS_MSVC

//==============================================================================
// DLL building settings on Windows
#if JUCE_MSVC
#if JUCE_WINDOWS
#ifdef JUCE_DLL_BUILD
#define JUCE_API __declspec (dllexport)
#pragma warning (disable: 4251)
#ifdef _MSC_VER
#pragma warning (disable: 4251)
#endif
#elif defined (JUCE_DLL)
#define JUCE_API __declspec (dllimport)
#pragma warning (disable: 4251)
#ifdef _MSC_VER
#pragma warning (disable: 4251)
#endif
#endif
#ifdef __INTEL_COMPILER
#if JUCE_MSVC && defined(__INTEL_COMPILER)
#pragma warning (disable: 1125) // (virtual override warning)
#endif
#elif defined (JUCE_DLL) || defined (JUCE_DLL_BUILD)
Expand All @@ -163,7 +167,7 @@ JUCE_END_IGNORE_WARNINGS_MSVC
#define JUCE_API /**< This macro is added to all JUCE public class declarations. */
#endif

#if JUCE_MSVC && JUCE_DLL_BUILD
#if JUCE_WINDOWS && JUCE_DLL_BUILD
#define JUCE_PUBLIC_IN_DLL_BUILD(declaration) public: declaration; private:
#else
#define JUCE_PUBLIC_IN_DLL_BUILD(declaration) declaration;
Expand Down