aboutsummaryrefslogtreecommitdiff
path: root/Makefile.target
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2004-11-09 23:09:44 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2004-11-09 23:09:44 +0000
commitfb065187e4ee9e0d1709b344ec01bb426ff1e43b (patch)
treeca7bf5ed6f0731429b9f9b6d62f2993583c9bcfb /Makefile.target
parentbf71c9d9b64a70e56db351c38ff71e5e27d871e7 (diff)
audio clean up (initial patch by malc)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1131 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'Makefile.target')
-rw-r--r--Makefile.target17
1 files changed, 10 insertions, 7 deletions
diff --git a/Makefile.target b/Makefile.target
index 280ffa1b3c..5982f08377 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -1,9 +1,5 @@
include config.mak
-#After enabling Adlib and/or FMOD rebuild QEMU from scratch
-#Uncomment following for adlib support
-#USE_ADLIB=1
-
#Uncomment following and specify proper paths/names for FMOD support
#USE_FMOD=1
#FMOD_INCLUDE=/net/include/fmod
@@ -278,11 +274,18 @@ VL_OBJS=vl.o osdep.o block.o readline.o monitor.o pci.o console.o
VL_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o
SOUND_HW = sb16.o
-AUDIODRV = audio.o ossaudio.o sdlaudio.o wavaudio.o
+AUDIODRV = audio.o wavaudio.o
+ifdef CONFIG_SDL
+AUDIODRV += sdlaudio.o
+endif
+ifdef CONFIG_OSS
+AUDIODRV += ossaudio.o
+endif
+
+pc.o: DEFINES := -DUSE_SB16 $(DEFINES)
-ifeq ($(USE_ADLIB),1)
+ifdef CONFIG_ADLIB
SOUND_HW += fmopl.o adlib.o
-audio.o: DEFINES := -DUSE_ADLIB $(DEFINES)
endif
ifeq ($(USE_FMOD),1)