Browse Source

Mac Catalyst: Fix compilation issues

v7.0.9
Tom Poole 2 years ago
parent
commit
b51e835baf
3 changed files with 13 additions and 6 deletions
  1. +9
    -5
      modules/juce_audio_devices/native/juce_ios_Audio.cpp
  2. +3
    -0
      modules/juce_core/native/juce_BasicNativeHeaders.h
  3. +1
    -1
      modules/juce_core/native/juce_posix_SharedCode.h

+ 9
- 5
modules/juce_audio_devices/native/juce_ios_Audio.cpp View File

@@ -705,13 +705,17 @@ struct iOSAudioIODevice::Pimpl : public AsyncUpdater
JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wdeprecated-declarations") JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wdeprecated-declarations")
Image getIcon (int size) Image getIcon (int size)
{ {
if (interAppAudioConnected)
if (@available (macCatalyst 14.0, *))
{ {
UIImage* hostUIImage = AudioOutputUnitGetHostIcon (audioUnit, size);
if (hostUIImage != nullptr)
return juce_createImageFromUIImage (hostUIImage);
if (interAppAudioConnected)
{
UIImage* hostUIImage = AudioOutputUnitGetHostIcon (audioUnit, size);
if (hostUIImage != nullptr)
return juce_createImageFromUIImage (hostUIImage);
}
} }
return Image();
return {};
} }
JUCE_END_IGNORE_WARNINGS_GCC_LIKE JUCE_END_IGNORE_WARNINGS_GCC_LIKE
#endif #endif


+ 3
- 0
modules/juce_core/native/juce_BasicNativeHeaders.h View File

@@ -32,7 +32,10 @@
#define GLES_SILENCE_DEPRECATION 1 #define GLES_SILENCE_DEPRECATION 1
#endif #endif
#define Component CarbonDummyCompName
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#undef Component
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#import <CoreData/CoreData.h> #import <CoreData/CoreData.h>
#import <MobileCoreServices/MobileCoreServices.h> #import <MobileCoreServices/MobileCoreServices.h>


+ 1
- 1
modules/juce_core/native/juce_posix_SharedCode.h View File

@@ -167,7 +167,7 @@ int juce_siginterrupt (int sig, int flag)
//============================================================================== //==============================================================================
namespace namespace
{ {
#if JUCE_LINUX || (JUCE_IOS && ! __DARWIN_ONLY_64_BIT_INO_T) // (this iOS stuff is to avoid a simulator bug)
#if JUCE_LINUX || (JUCE_IOS && (! TARGET_OS_MACCATALYST) && (! __DARWIN_ONLY_64_BIT_INO_T)) // (this iOS stuff is to avoid a simulator bug)
using juce_statStruct = struct stat64; using juce_statStruct = struct stat64;
#define JUCE_STAT stat64 #define JUCE_STAT stat64
#else #else


Loading…
Cancel
Save