From 423d70dd7b4d23a9978cb98de4ac60ce2004ec70 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 27 Feb 2021 20:02:50 +0000 Subject: [PATCH] Fixes for mingw Signed-off-by: falkTX --- modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp | 2 +- .../utility/juce_CheckSettingMacros.h | 5 ----- .../format_types/juce_VSTPluginFormat.cpp | 3 --- modules/juce_core/threads/juce_WaitableEvent.h | 4 ++++ 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp index 8683dc728a..94f6bf5696 100644 --- a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp @@ -61,7 +61,7 @@ JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4996 4100) #define PRAGMA_ALIGN_SUPPORTED 1 #endif -#if ! JUCE_MSVC +#if ! JUCE_WINDOWS #define __cdecl #endif diff --git a/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h b/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h index 6bea843075..baaa59f061 100644 --- a/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h +++ b/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h @@ -73,11 +73,6 @@ #define JucePlugin_Build_RTAS 0 #endif -#if ! (defined (_MSC_VER) || defined (__APPLE_CPP__) || defined (__APPLE_CC__) || defined (LINUX) || defined (__linux__)) - #undef JucePlugin_Build_VST3 - #define JucePlugin_Build_VST3 0 -#endif - //============================================================================== #if JucePlugin_Build_LV2 && ! defined (JucePlugin_LV2URI) #error "You need to define the JucePlugin_LV2URI value!" diff --git a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp index 620ba98741..d9359b736d 100644 --- a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp +++ b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp @@ -62,9 +62,6 @@ JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4355) #ifndef WM_APPCOMMAND #define WM_APPCOMMAND 0x0319 #endif - - extern "C" void _fpreset(); - extern "C" void _clearfp(); #elif ! JUCE_WINDOWS static void _fpreset() {} static void _clearfp() {} diff --git a/modules/juce_core/threads/juce_WaitableEvent.h b/modules/juce_core/threads/juce_WaitableEvent.h index 52269f706a..6709036534 100644 --- a/modules/juce_core/threads/juce_WaitableEvent.h +++ b/modules/juce_core/threads/juce_WaitableEvent.h @@ -20,6 +20,10 @@ ============================================================================== */ +#if JUCE_MINGW && !defined(_GLIBCXX_HAS_GTHREADS) +#include "mingw-std-threads/mingw.condition_variable.h" +#endif + namespace juce {