8b46d7e2dc
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>
36 lines
936 B
Meson
36 lines
936 B
Meson
softmmu_ss.add([spice_headers, files('audio.c')])
|
|
softmmu_ss.add(files(
|
|
'audio_legacy.c',
|
|
'mixeng.c',
|
|
'noaudio.c',
|
|
'wavaudio.c',
|
|
'wavcapture.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 = {}
|
|
foreach m : [
|
|
['alsa', alsa, files('alsaaudio.c')],
|
|
['oss', oss, files('ossaudio.c')],
|
|
['pa', pulse, files('paaudio.c')],
|
|
['sdl', sdl, files('sdlaudio.c')],
|
|
['jack', jack, files('jackaudio.c')],
|
|
['spice', spice, files('spiceaudio.c')]
|
|
]
|
|
if m[1].found()
|
|
module_ss = ss.source_set()
|
|
module_ss.add(m[1], m[2])
|
|
audio_modules += {m[0] : module_ss}
|
|
endif
|
|
endforeach
|
|
|
|
if dbus_display
|
|
module_ss = ss.source_set()
|
|
module_ss.add(when: [gio, pixman, opengl, 'CONFIG_GIO'], if_true: files('dbusaudio.c'))
|
|
audio_modules += {'dbus': module_ss}
|
|
endif
|
|
|
|
modules += {'audio': audio_modules}
|