mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Merge 15f8e140f0 into 0e43b31e50

Browse source
This commit is contained in:
無常 2025-12-27 19:47:48 +00:00 • committed by GitHub
commit 37feb7cb6c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/juce_core/system/juce_StandardHeader.h
View file

@ -144,15 +144,19 @@ JUCE_END_IGNORE_WARNINGS_MSVC
//============================================================================== //==============================================================================
// DLL building settings on Windows // DLL building settings on Windows
#if JUCE_MSVC #if JUCE_WINDOWS
#ifdef JUCE_DLL_BUILD #ifdef JUCE_DLL_BUILD
#define JUCE_API __declspec (dllexport) #define JUCE_API __declspec (dllexport)
#pragma warning (disable: 4251) #ifdef _MSC_VER
#pragma warning (disable: 4251)
#endif
#elif defined (JUCE_DLL) #elif defined (JUCE_DLL)
#define JUCE_API __declspec (dllimport) #define JUCE_API __declspec (dllimport)
#pragma warning (disable: 4251) #ifdef _MSC_VER
#pragma warning (disable: 4251)
#endif
#endif #endif
#ifdef __INTEL_COMPILER #if JUCE_MSVC && defined(__INTEL_COMPILER)
#pragma warning (disable: 1125) // (virtual override warning) #pragma warning (disable: 1125) // (virtual override warning)
#endif #endif
#elif defined (JUCE_DLL) || defined (JUCE_DLL_BUILD) #elif defined (JUCE_DLL) || defined (JUCE_DLL_BUILD)
@ -165,7 +169,7 @@ JUCE_END_IGNORE_WARNINGS_MSVC
#define JUCE_API #define JUCE_API
#endif #endif
#if JUCE_MSVC && JUCE_DLL_BUILD #if JUCE_WINDOWS && JUCE_DLL_BUILD
#define JUCE_PUBLIC_IN_DLL_BUILD(declaration) public: declaration; private: #define JUCE_PUBLIC_IN_DLL_BUILD(declaration) public: declaration; private:
#else #else
#define JUCE_PUBLIC_IN_DLL_BUILD(declaration) declaration; #define JUCE_PUBLIC_IN_DLL_BUILD(declaration) declaration;