diff options
| author | Philippe Mathieu-Daudé | 2022-02-15 11:05:44 +0100 |
|---|---|---|
| committer | Philippe Mathieu-Daudé | 2022-03-15 13:36:33 +0100 |
| commit | 8b46d7e2dc8ec4b3515e43bc28ee77d9afab8b23 (patch) | |
| tree | f83c979025bbe826044811a6f66a5ad4ec283b46 | |
| parent | coreaudio: Always return 0 in handle_voice_change (diff) | |
| download | qemu-8b46d7e2dc8ec4b3515e43bc28ee77d9afab8b23.tar.gz qemu-8b46d7e2dc8ec4b3515e43bc28ee77d9afab8b23.tar.xz qemu-8b46d7e2dc8ec4b3515e43bc28ee77d9afab8b23.zip | |
audio: Rename coreaudio extension to use Objective-C compiler
The coreaudio library includes Objective-C declarations (using the
caret '^' symbol to declare block references [*]). When building
with a C compiler we get:
[175/839] Compiling C object libcommon.fa.p/audio_coreaudio.c.o
In file included from /Library/Developer/CommandLineTools/SDKs/MacOSX12.sdk/System/Library/Frameworks/CoreAudio.framework/Headers/CoreAudio.h:18,
from ../../audio/coreaudio.c:26:
/Library/Developer/CommandLineTools/SDKs/MacOSX12.sdk/System/Library/Frameworks/CoreAudio.framework/Headers/AudioHardware.h:162:2: error: expected identifier or '(' before '^' token
162 | (^AudioObjectPropertyListenerBlock)( UInt32 inNumberAddresses,
| ^
FAILED: libcommon.fa.p/audio_coreaudio.c.o
Rename the file to use the Objective-C default extension (.m) so
meson calls the correct compiler.
[*] https://developer.apple.com/library/archive/documentation/Cocoa/Conceptual/ProgrammingWithObjectiveC/WorkingwithBlocks/WorkingwithBlocks.html
Reviewed-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
| -rw-r--r-- | audio/coreaudio.m (renamed from audio/coreaudio.c) | 0 | ||||
| -rw-r--r-- | audio/meson.build | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/audio/coreaudio.c b/audio/coreaudio.m index 3186b68474..3186b68474 100644 --- a/audio/coreaudio.c +++ b/audio/coreaudio.m diff --git a/audio/meson.build b/audio/meson.build index d9b295514f..94dab16891 100644 --- a/audio/meson.build +++ b/audio/meson.build @@ -7,7 +7,7 @@ softmmu_ss.add(files( 'wavcapture.c', )) -softmmu_ss.add(when: coreaudio, if_true: files('coreaudio.c')) +softmmu_ss.add(when: coreaudio, if_true: files('coreaudio.m')) softmmu_ss.add(when: dsound, if_true: files('dsoundaudio.c', 'audio_win_int.c')) audio_modules = {} |