Browse Source

Fixed a double inclusion of the Carbon headers

tags/2021-05-28
tpoole 8 years ago
parent
commit
8f54c73686
3 changed files with 1 additions and 9 deletions
  1. +0
    -4
      modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm
  2. +0
    -5
      modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
  3. +1
    -0
      modules/juce_audio_processors/juce_audio_processors.cpp

+ 0
- 4
modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm View File

@@ -53,10 +53,6 @@
#include <CoreAudioKit/AUViewController.h> #include <CoreAudioKit/AUViewController.h>
#endif #endif
#if JUCE_SUPPORT_CARBON
#include "../../juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h"
#endif
#include "../../juce_audio_basics/native/juce_mac_CoreAudioLayouts.h" #include "../../juce_audio_basics/native/juce_mac_CoreAudioLayouts.h"
#include "../../juce_audio_devices/native/juce_MidiDataConcatenator.h" #include "../../juce_audio_devices/native/juce_MidiDataConcatenator.h"
#include "juce_AU_Shared.h" #include "juce_AU_Shared.h"


+ 0
- 5
modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp View File

@@ -26,11 +26,6 @@
#if JUCE_PLUGINHOST_VST #if JUCE_PLUGINHOST_VST
//==============================================================================
#if JUCE_MAC && JUCE_SUPPORT_CARBON
#include "../../juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h"
#endif
//============================================================================== //==============================================================================
#undef PRAGMA_ALIGN_SUPPORTED #undef PRAGMA_ALIGN_SUPPORTED


+ 1
- 0
modules/juce_audio_processors/juce_audio_processors.cpp View File

@@ -45,6 +45,7 @@
&& ((JUCE_PLUGINHOST_VST || JUCE_PLUGINHOST_AU) \ && ((JUCE_PLUGINHOST_VST || JUCE_PLUGINHOST_AU) \
|| ! (defined (MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6)) || ! (defined (MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6))
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>
#include "../juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h"
#endif #endif
#endif #endif


Loading…
Cancel
Save