diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2018-03-01 11:05:46 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2018-03-05 08:44:11 +0100 |
| commit | 1ef1ec2a44a9c851c4875c404a105cbb2dba9e56 (patch) | |
| tree | 868686f79b38d1e6827a3c588f272f8ebbe0e315 | |
| parent | 2373f7d581e82c11645a799a032b9e64fd61c1b8 (diff) | |
| download | qemu-1ef1ec2a44a9c851c4875c404a105cbb2dba9e56.zip qemu-1ef1ec2a44a9c851c4875c404a105cbb2dba9e56.tar.gz qemu-1ef1ec2a44a9c851c4875c404a105cbb2dba9e56.tar.bz2 | |
audio: rename CONFIG_* to CONFIG_AUDIO_*
This avoids a name clash for CONFIG_SDL, which is used by both sdl video
support and sdl audio support. It also more clear that this is a audio
driver configuration.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20180301100547.18962-13-kraxel@redhat.com
| -rw-r--r-- | audio/Makefile.objs | 12 | ||||
| -rw-r--r-- | audio/audio_int.h | 2 | ||||
| -rwxr-xr-x | configure | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/audio/Makefile.objs b/audio/Makefile.objs index 8a5ede6..f6ce5c6 100644 --- a/audio/Makefile.objs +++ b/audio/Makefile.objs @@ -1,11 +1,11 @@ common-obj-y = audio.o noaudio.o wavaudio.o mixeng.o -common-obj-$(CONFIG_SDL) += sdlaudio.o -common-obj-$(CONFIG_OSS) += ossaudio.o +common-obj-$(CONFIG_AUDIO_SDL) += sdlaudio.o +common-obj-$(CONFIG_AUDIO_OSS) += ossaudio.o common-obj-$(CONFIG_SPICE) += spiceaudio.o -common-obj-$(CONFIG_COREAUDIO) += coreaudio.o -common-obj-$(CONFIG_ALSA) += alsaaudio.o -common-obj-$(CONFIG_DSOUND) += dsoundaudio.o -common-obj-$(CONFIG_PA) += paaudio.o +common-obj-$(CONFIG_AUDIO_COREAUDIO) += coreaudio.o +common-obj-$(CONFIG_AUDIO_ALSA) += alsaaudio.o +common-obj-$(CONFIG_AUDIO_DSOUND) += dsoundaudio.o +common-obj-$(CONFIG_AUDIO_PA) += paaudio.o common-obj-$(CONFIG_AUDIO_PT_INT) += audio_pt_int.o common-obj-$(CONFIG_AUDIO_WIN_INT) += audio_win_int.o common-obj-y += wavcapture.o diff --git a/audio/audio_int.h b/audio/audio_int.h index 5b25da0..700bd43 100644 --- a/audio/audio_int.h +++ b/audio/audio_int.h @@ -25,7 +25,7 @@ #ifndef QEMU_AUDIO_INT_H #define QEMU_AUDIO_INT_H -#ifdef CONFIG_COREAUDIO +#ifdef CONFIG_AUDIO_COREAUDIO #define FLOAT_MIXENG /* #define RECIPROCAL */ #endif @@ -5981,7 +5981,7 @@ if test "$cap_ng" = "yes" ; then fi echo "CONFIG_AUDIO_DRIVERS=$audio_drv_list" >> $config_host_mak for drv in $audio_drv_list; do - def=CONFIG_$(echo $drv | LC_ALL=C tr '[a-z]' '[A-Z]') + def=CONFIG_AUDIO_$(echo $drv | LC_ALL=C tr '[a-z]' '[A-Z]') echo "$def=y" >> $config_host_mak done echo "ALSA_LIBS=$alsa_libs" >> $config_host_mak |