[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 12/22] audio: Rename coreaudio extension to use Objective-C co
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v7 12/22] audio: Rename coreaudio extension to use Objective-C compiler |
Date: |
Mon, 7 Mar 2022 00:17:43 +0100 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
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>
---
audio/{coreaudio.c => coreaudio.m} | 0
audio/meson.build | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
rename audio/{coreaudio.c => coreaudio.m} (100%)
diff --git a/audio/coreaudio.c b/audio/coreaudio.m
similarity index 100%
rename from audio/coreaudio.c
rename to 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 = {}
--
2.34.1
- [PATCH v7 05/22] hvf: Remove deprecated hv_vcpu_flush() calls, (continued)
- [PATCH v7 07/22] block/file-posix: Remove a deprecation warning on macOS 12, Philippe Mathieu-Daudé, 2022/03/06
- [PATCH v7 08/22] audio/coreaudio: Remove a deprecation warning on macOS 12, Philippe Mathieu-Daudé, 2022/03/06
- [PATCH v7 09/22] audio/dbus: Fix building with modules on macOS, Philippe Mathieu-Daudé, 2022/03/06
- [PATCH v7 10/22] audio: Log context for audio bug, Philippe Mathieu-Daudé, 2022/03/06
- [PATCH v7 11/22] coreaudio: Always return 0 in handle_voice_change, Philippe Mathieu-Daudé, 2022/03/06
- [PATCH v7 12/22] audio: Rename coreaudio extension to use Objective-C compiler,
Philippe Mathieu-Daudé <=
- [PATCH v7 13/22] osdep: Avoid using Clang-specific __builtin_available(), Philippe Mathieu-Daudé, 2022/03/06
- [PATCH v7 14/22] meson: Resolve the entitlement.sh script once for good, Philippe Mathieu-Daudé, 2022/03/06
- [PATCH v7 15/22] meson: Log QEMU_CXXFLAGS content in summary, Philippe Mathieu-Daudé, 2022/03/06
- [PATCH v7 16/22] configure: Pass filtered QEMU_OBJCFLAGS to meson, Philippe Mathieu-Daudé, 2022/03/06
- [PATCH v7 17/22] ui/cocoa: Constify qkeycode translation arrays, Philippe Mathieu-Daudé, 2022/03/06