You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

59 lines
2.3KB

  1. diff --git a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp
  2. index 23484732b..d2106179c 100644
  3. --- a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp
  4. +++ b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp
  5. @@ -61,7 +61,7 @@ JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4996 4100)
  6. #define PRAGMA_ALIGN_SUPPORTED 1
  7. #endif
  8. -#if ! JUCE_MSVC
  9. +#if ! JUCE_WINDOWS
  10. #define __cdecl
  11. #endif
  12. diff --git a/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h b/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h
  13. index 6bea84307..baaa59f06 100644
  14. --- a/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h
  15. +++ b/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h
  16. @@ -73,11 +73,6 @@
  17. #define JucePlugin_Build_RTAS 0
  18. #endif
  19. -#if ! (defined (_MSC_VER) || defined (__APPLE_CPP__) || defined (__APPLE_CC__) || defined (LINUX) || defined (__linux__))
  20. - #undef JucePlugin_Build_VST3
  21. - #define JucePlugin_Build_VST3 0
  22. -#endif
  23. -
  24. //==============================================================================
  25. #if JucePlugin_Build_LV2 && ! defined (JucePlugin_LV2URI)
  26. #error "You need to define the JucePlugin_LV2URI value!"
  27. diff --git a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
  28. index adf058959..c39d6f796 100644
  29. --- a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
  30. +++ b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
  31. @@ -61,9 +61,6 @@ JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4355)
  32. #ifndef WM_APPCOMMAND
  33. #define WM_APPCOMMAND 0x0319
  34. #endif
  35. -
  36. - extern "C" void _fpreset();
  37. - extern "C" void _clearfp();
  38. #elif ! JUCE_WINDOWS
  39. static void _fpreset() {}
  40. static void _clearfp() {}
  41. diff --git a/modules/juce_core/threads/juce_WaitableEvent.h b/modules/juce_core/threads/juce_WaitableEvent.h
  42. index 52269f706..670903653 100644
  43. --- a/modules/juce_core/threads/juce_WaitableEvent.h
  44. +++ b/modules/juce_core/threads/juce_WaitableEvent.h
  45. @@ -20,6 +20,10 @@
  46. ==============================================================================
  47. */
  48. +#if JUCE_MINGW && !defined(_GLIBCXX_HAS_GTHREADS)
  49. +#include "mingw-std-threads/mingw.condition_variable.h"
  50. +#endif
  51. +
  52. namespace juce
  53. {