From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1CRcKF-0003YV-65 for qemu-devel@nongnu.org; Tue, 09 Nov 2004 15:10:47 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1CRcKE-0003YJ-QN for qemu-devel@nongnu.org; Tue, 09 Nov 2004 15:10:46 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CRcKE-0003YG-NO for qemu-devel@nongnu.org; Tue, 09 Nov 2004 15:10:46 -0500 Received: from [128.112.136.38] (helo=bluebox.CS.Princeton.EDU) by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168) (Exim 4.34) id 1CRcBl-0003xy-CX for qemu-devel@nongnu.org; Tue, 09 Nov 2004 15:02:01 -0500 Received: from mefworklaptop.cs.princeton.edu (mef-work-laptop.CS.Princeton.EDU [128.112.95.45]) (authenticated bits=0) by bluebox.CS.Princeton.EDU (8.12.11/8.12.11) with ESMTP id iA9K1vbJ029410 (version=TLSv1/SSLv3 cipher=EXP-RC4-MD5 bits=40 verify=NOT) for ; Tue, 9 Nov 2004 15:01:59 -0500 (EST) From: "Marc E. Fiuczynski" Date: Tue, 9 Nov 2004 15:01:58 -0500 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_NextPart_000_001F_01C4C66D.0FDBE260" In-Reply-To: Subject: [Qemu-devel] PATCH to qemu head for disabled sdl Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This is a multi-part message in MIME format. ------=_NextPart_000_001F_01C4C66D.0FDBE260 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Hi, The attached patch lets you compile qemu cvs HEAD with sdl disabled. The fix is trivial and I hope that it is of use to the qemu developers. Marc ------=_NextPart_000_001F_01C4C66D.0FDBE260 Content-Type: application/octet-stream; name="sdl-audio-off.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="sdl-audio-off.patch" Index: Makefile.target=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: /cvsroot/qemu/qemu/Makefile.target,v=0A= retrieving revision 1.44=0A= diff -d -u -r1.44 Makefile.target=0A= --- Makefile.target 7 Nov 2004 18:04:02 -0000 1.44=0A= +++ Makefile.target 9 Nov 2004 19:55:48 -0000=0A= @@ -278,7 +278,12 @@=0A= VL_OBJS+=3Dblock-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o=0A= =0A= SOUND_HW =3D sb16.o=0A= -AUDIODRV =3D audio.o ossaudio.o sdlaudio.o wavaudio.o=0A= +AUDIODRV =3D audio.o ossaudio.o wavaudio.o=0A= +ifdef CONFIG_SDL=0A= +AUDIODRV +=3D sdlaudio.o=0A= +audio.o: DEFINES :=3D -DUSE_SDL_AUDIO $(DEFINES)=0A= +endif=0A= +=0A= =0A= ifeq ($(USE_ADLIB),1)=0A= SOUND_HW +=3D fmopl.o adlib.o=0A= Index: audio/audio.c=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: /cvsroot/qemu/qemu/audio/audio.c,v=0A= retrieving revision 1.1=0A= diff -d -u -r1.1 audio.c=0A= --- audio/audio.c 7 Nov 2004 18:04:02 -0000 1.1=0A= +++ audio/audio.c 9 Nov 2004 19:55:48 -0000=0A= @@ -28,7 +28,6 @@=0A= #define AUDIO_CAP "audio"=0A= #include "audio/audio.h"=0A= =0A= -#define USE_SDL_AUDIO=0A= #define USE_WAV_AUDIO=0A= =0A= #if defined __linux__ || (defined _BSD && !defined __APPLE__)=0A= ------=_NextPart_000_001F_01C4C66D.0FDBE260--