mirror of
https://github.com/qemu/qemu.git
synced 2024-11-25 11:53:39 +08:00
d2bfbdf316
Commitc9c847481broken dbus audio module compilation with bad 'CONFIG_GIO' usage. Furthermore, it implied extra dependency on audio module which aren't necessary. The problem was that 'dbus_display' is not correctly automatically set on MacOS, because opengl dependency wasn't taken into account. Fixes:c9c847481("audio/dbus: Fix building with modules on macOS") Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-Id: <20220622154918.560870-1-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
36 lines
904 B
Meson
36 lines
904 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, if_true: files('dbusaudio.c'))
|
|
audio_modules += {'dbus': module_ss}
|
|
endif
|
|
|
|
modules += {'audio': audio_modules}
|