diff options
| author | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2022-05-10 21:02:26 +0300 |
|---|---|---|
| committer | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2022-05-10 21:11:34 +0300 |
| commit | ffe61e0895fd1aea746619280eca3cfd59b0c182 (patch) | |
| tree | 5c882fd193a2ceca93aae1814c3f46b42e946e31 /drivers | |
| parent | cc3ed63af68ea9262bf8015d34aa6dd6327112e8 (diff) | |
[macOS / iOS] Fix text-to-speech build with older macOS / iOS SDK.
Add __has_include check for AVFAudio include.
Add some explicit casts to avoid conflicts.
Change all `include`s to `import`s for consistency.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/coreaudio/audio_driver_coreaudio.h | 4 | ||||
| -rw-r--r-- | drivers/coremidi/midi_driver_coremidi.cpp | 4 | ||||
| -rw-r--r-- | drivers/coremidi/midi_driver_coremidi.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/coreaudio/audio_driver_coreaudio.h b/drivers/coreaudio/audio_driver_coreaudio.h index b19f133d89..f86037f092 100644 --- a/drivers/coreaudio/audio_driver_coreaudio.h +++ b/drivers/coreaudio/audio_driver_coreaudio.h @@ -35,9 +35,9 @@ #include "servers/audio_server.h" -#include <AudioUnit/AudioUnit.h> +#import <AudioUnit/AudioUnit.h> #ifdef OSX_ENABLED -#include <CoreAudio/AudioHardware.h> +#import <CoreAudio/AudioHardware.h> #endif class AudioDriverCoreAudio : public AudioDriver { diff --git a/drivers/coremidi/midi_driver_coremidi.cpp b/drivers/coremidi/midi_driver_coremidi.cpp index ecd10f900b..dc69ab9472 100644 --- a/drivers/coremidi/midi_driver_coremidi.cpp +++ b/drivers/coremidi/midi_driver_coremidi.cpp @@ -34,8 +34,8 @@ #include "core/string/print_string.h" -#include <CoreAudio/HostTime.h> -#include <CoreServices/CoreServices.h> +#import <CoreAudio/HostTime.h> +#import <CoreServices/CoreServices.h> void MIDIDriverCoreMidi::read(const MIDIPacketList *packet_list, void *read_proc_ref_con, void *src_conn_ref_con) { MIDIPacket *packet = const_cast<MIDIPacket *>(packet_list->packet); diff --git a/drivers/coremidi/midi_driver_coremidi.h b/drivers/coremidi/midi_driver_coremidi.h index be0a9f610e..0085141c6d 100644 --- a/drivers/coremidi/midi_driver_coremidi.h +++ b/drivers/coremidi/midi_driver_coremidi.h @@ -36,7 +36,7 @@ #include "core/os/midi_driver.h" #include "core/templates/vector.h" -#include <CoreMIDI/CoreMIDI.h> +#import <CoreMIDI/CoreMIDI.h> #include <stdio.h> class MIDIDriverCoreMidi : public MIDIDriver { |