Browse Source

Revert "Try to fix drowAudio build on macOS"

This reverts commit df6e056173.
tags/2020-12-27
falkTX 4 years ago
parent
commit
72d6df816c
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 11 additions and 11 deletions
  1. +3
    -3
      libs/drowaudio/source/dRowAudio/dRowAudio.cpp
  2. +8
    -8
      libs/drowaudio/source/dRowAudio/dRowAudio.h

+ 3
- 3
libs/drowaudio/source/dRowAudio/dRowAudio.cpp View File

@@ -34,8 +34,6 @@


//#include "../juce_core/native/juce_BasicNativeHeaders.h" //#include "../juce_core/native/juce_BasicNativeHeaders.h"


#include "dRowAudio.h"

#if JUCE_MAC || JUCE_IOS #if JUCE_MAC || JUCE_IOS
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <AudioToolbox/AudioToolbox.h> #import <AudioToolbox/AudioToolbox.h>
@@ -46,6 +44,8 @@
#import <MediaPlayer/MediaPlayer.h> #import <MediaPlayer/MediaPlayer.h>
#endif #endif


#include "dRowAudio.h"

#include "audio/soundtouch/SoundTouch_Source.cpp" #include "audio/soundtouch/SoundTouch_Source.cpp"


namespace drow { namespace drow {
@@ -124,4 +124,4 @@ namespace drow {
#include "utility/dRowAudio_UnityProjectBuilder.cpp" #include "utility/dRowAudio_UnityProjectBuilder.cpp"
#include "parameters/dRowAudio_PluginParameter.cpp" #include "parameters/dRowAudio_PluginParameter.cpp"


}
}

+ 8
- 8
libs/drowaudio/source/dRowAudio/dRowAudio.h View File

@@ -140,14 +140,6 @@
*/ */


//============================================================================= //=============================================================================
#if JUCE_MAC || JUCE_IOS
#define Point CarbonDummyPointName
#define Component CarbonDummyCompName
#include <Accelerate/Accelerate.h>
#undef Point
#undef Component
#endif

#include <modules/juce_audio_basics/juce_audio_basics.h> #include <modules/juce_audio_basics/juce_audio_basics.h>
#include <modules/juce_audio_devices/juce_audio_devices.h> #include <modules/juce_audio_devices/juce_audio_devices.h>
#include <modules/juce_audio_formats/juce_audio_formats.h> #include <modules/juce_audio_formats/juce_audio_formats.h>
@@ -162,6 +154,14 @@
#include <modules/juce_cryptography/juce_cryptography.h> #include <modules/juce_cryptography/juce_cryptography.h>
#endif #endif


#if JUCE_MAC || JUCE_IOS
#define Point CarbonDummyPointName
#define Component CarbonDummyCompName
#include <Accelerate/Accelerate.h>
#undef Point
#undef Component
#endif

#undef min #undef min
#undef max #undef max




Loading…
Cancel
Save