From df6e0561732294411b9aa816f28205b048d35f57 Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 17 Nov 2020 00:22:42 +0000 Subject: [PATCH] Try to fix drowAudio build on macOS --- libs/drowaudio/source/dRowAudio/dRowAudio.cpp | 6 +++--- libs/drowaudio/source/dRowAudio/dRowAudio.h | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libs/drowaudio/source/dRowAudio/dRowAudio.cpp b/libs/drowaudio/source/dRowAudio/dRowAudio.cpp index ac0d81a6..100c0942 100755 --- a/libs/drowaudio/source/dRowAudio/dRowAudio.cpp +++ b/libs/drowaudio/source/dRowAudio/dRowAudio.cpp @@ -34,6 +34,8 @@ //#include "../juce_core/native/juce_BasicNativeHeaders.h" +#include "dRowAudio.h" + #if JUCE_MAC || JUCE_IOS #import #import @@ -44,8 +46,6 @@ #import #endif -#include "dRowAudio.h" - #include "audio/soundtouch/SoundTouch_Source.cpp" namespace drow { @@ -124,4 +124,4 @@ namespace drow { #include "utility/dRowAudio_UnityProjectBuilder.cpp" #include "parameters/dRowAudio_PluginParameter.cpp" -} \ No newline at end of file +} diff --git a/libs/drowaudio/source/dRowAudio/dRowAudio.h b/libs/drowaudio/source/dRowAudio/dRowAudio.h index f90be157..7ad16d00 100755 --- a/libs/drowaudio/source/dRowAudio/dRowAudio.h +++ b/libs/drowaudio/source/dRowAudio/dRowAudio.h @@ -140,6 +140,14 @@ */ //============================================================================= +#if JUCE_MAC || JUCE_IOS + #define Point CarbonDummyPointName + #define Component CarbonDummyCompName + #include + #undef Point + #undef Component +#endif + #include #include #include @@ -154,14 +162,6 @@ #include #endif -#if JUCE_MAC || JUCE_IOS - #define Point CarbonDummyPointName - #define Component CarbonDummyCompName - #include - #undef Point - #undef Component -#endif - #undef min #undef max