Browse Source

Fixed audio plugin mac build.

tags/2021-05-28
Julian Storer 14 years ago
parent
commit
02494168e6
2 changed files with 12 additions and 2 deletions
  1. +9
    -0
      modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm
  2. +3
    -2
      modules/juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h

+ 9
- 0
modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm View File

@@ -40,8 +40,15 @@
#include <AudioUnit/AUCocoaUIView.h> #include <AudioUnit/AUCocoaUIView.h>
#include <AudioUnit/AudioUnit.h> #include <AudioUnit/AudioUnit.h>
#include <AudioToolbox/AudioUnitUtilities.h> #include <AudioToolbox/AudioUnitUtilities.h>
#if JUCE_SUPPORT_CARBON
#define Point CarbonDummyPointName
#define Component CarbonDummyCompName
#endif
#include "AUMIDIEffectBase.h" #include "AUMIDIEffectBase.h"
#include "MusicDeviceBase.h" #include "MusicDeviceBase.h"
#undef Point
#undef Component
/** The BUILD_AU_CARBON_UI flag lets you specify whether old-school carbon hosts are supported as /** The BUILD_AU_CARBON_UI flag lets you specify whether old-school carbon hosts are supported as
well as ones that can open a cocoa view. If this is enabled, you'll need to also add the AUCarbonBase well as ones that can open a cocoa view. If this is enabled, you'll need to also add the AUCarbonBase
@@ -57,7 +64,9 @@
#if BUILD_AU_CARBON_UI #if BUILD_AU_CARBON_UI
#undef Button #undef Button
#define Point CarbonDummyPointName
#include "AUCarbonViewBase.h" #include "AUCarbonViewBase.h"
#undef Point
class JuceAUView; class JuceAUView;
#endif #endif


+ 3
- 2
modules/juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h View File

@@ -47,8 +47,6 @@
#undef Time #undef Time
#else #else
#include <Cocoa/Cocoa.h>
#ifndef JUCE_SUPPORT_CARBON #ifndef JUCE_SUPPORT_CARBON
#define JUCE_SUPPORT_CARBON 1 #define JUCE_SUPPORT_CARBON 1
#endif #endif
@@ -56,8 +54,11 @@
#if JUCE_SUPPORT_CARBON #if JUCE_SUPPORT_CARBON
#define Point CarbonDummyPointName #define Point CarbonDummyPointName
#define Component CarbonDummyCompName #define Component CarbonDummyCompName
#include <Cocoa/Cocoa.h>
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>
#undef Point #undef Point
#undef Component #undef Component
#else
#include <Cocoa/Cocoa.h>
#endif #endif
#endif #endif

Loading…
Cancel
Save