From: "Philippe Mathieu-Daudé" <philippe.mathieu.daude@gmail.com>
To: qemu-devel@nongnu.org
Cc: "Christian Schoenebeck" <qemu_oss@crudebyte.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Cameron Esfahani" <dirty@apple.com>,
"Roman Bolshakov" <r.bolshakov@yadro.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Akihiko Odaki" <akihiko.odaki@gmail.com>
Subject: [PULL 11/21] audio: Rename coreaudio extension to use Objective-C compiler
Date: Tue, 15 Mar 2022 13:53:40 +0100 [thread overview]
Message-ID: <20220315125350.82452-12-philippe.mathieu.daude@gmail.com> (raw)
In-Reply-To: <20220315125350.82452-1-philippe.mathieu.daude@gmail.com>
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
next prev parent reply other threads:[~2022-03-15 13:04 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-15 12:53 [PULL 00/21] Darwin patches for 2022-03-15 Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 01/21] configure: Allow passing extra Objective C compiler flags Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 02/21] tests/fp/berkeley-testfloat-3: Ignore ignored #pragma directives Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 03/21] hvf: Use standard CR0 and CR4 register definitions Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 04/21] hvf: Make hvf_get_segments() / hvf_put_segments() local Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 05/21] hvf: Remove deprecated hv_vcpu_flush() calls Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 06/21] block/file-posix: Remove a deprecation warning on macOS 12 Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 07/21] audio/coreaudio: " Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 08/21] audio/dbus: Fix building with modules on macOS Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 09/21] audio: Log context for audio bug Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 10/21] coreaudio: Always return 0 in handle_voice_change Philippe Mathieu-Daudé
2022-03-15 12:53 ` Philippe Mathieu-Daudé [this message]
2022-03-15 12:53 ` [PULL 12/21] osdep: Avoid using Clang-specific __builtin_available() Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 13/21] meson: Resolve the entitlement.sh script once for good Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 14/21] meson: Log QEMU_CXXFLAGS content in summary Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 15/21] configure: Pass filtered QEMU_OBJCFLAGS to meson Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 16/21] ui/cocoa: Constify qkeycode translation arrays Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 17/21] ui/cocoa: add option to disable left-command forwarding to guest Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 18/21] ui/cocoa: release mouse when user switches away from QEMU window Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 19/21] ui/cocoa: capture all keys and combos when mouse is grabbed Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 20/21] ui/cocoa: add option to swap Option and Command Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 21/21] MAINTAINERS: Volunteer to maintain Darwin-based hosts support Philippe Mathieu-Daudé
2022-03-15 23:07 ` [PULL 00/21] Darwin patches for 2022-03-15 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220315125350.82452-12-philippe.mathieu.daude@gmail.com \
--to=philippe.mathieu.daude@gmail.com \
--cc=akihiko.odaki@gmail.com \
--cc=dirty@apple.com \
--cc=f4bug@amsat.org \
--cc=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu_oss@crudebyte.com \
--cc=r.bolshakov@yadro.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).