mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-01-09 23:34:20 +00:00
Merge 15f8e140f0 into 0e43b31e50
This commit is contained in:
commit
37feb7cb6c
1 changed files with 9 additions and 5 deletions
|
|
@ -144,15 +144,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)
|
||||
|
|
@ -165,7 +169,7 @@ JUCE_END_IGNORE_WARNINGS_MSVC
|
|||
#define JUCE_API
|
||||
#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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue