From 8dddad9b871e9969cec5920c3225d4d9d7692006 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Mon, 22 Aug 2011 14:30:49 -0400
Subject: [PATCH] Let XAudio2 target be removed from the build by removing it
 from SDL_config.h

---
 src/audio/xaudio2/SDL_xaudio2.c | 2 +-
 src/audio/xaudio2/SDL_xaudio2.h | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/audio/xaudio2/SDL_xaudio2.c b/src/audio/xaudio2/SDL_xaudio2.c
index de0e9a351..8fb74cbd9 100644
--- a/src/audio/xaudio2/SDL_xaudio2.c
+++ b/src/audio/xaudio2/SDL_xaudio2.c
@@ -27,7 +27,7 @@
 #define INITGUID 1
 #include "SDL_xaudio2.h"
 
-#if SDL_HAVE_XAUDIO2_H
+#ifdef SDL_HAVE_XAUDIO2_H
 
 static __inline__ char *
 utf16_to_utf8(const WCHAR *S)
diff --git a/src/audio/xaudio2/SDL_xaudio2.h b/src/audio/xaudio2/SDL_xaudio2.h
index e0e20ebe6..8a55c1a2f 100644
--- a/src/audio/xaudio2/SDL_xaudio2.h
+++ b/src/audio/xaudio2/SDL_xaudio2.h
@@ -25,15 +25,14 @@
 
 #include "../SDL_sysaudio.h"
 
-/* XAudio2 is available as of the March 2008 DirectX SDK */
-#include <dxsdkver.h>
+#if SDL_AUDIO_DRIVER_XAUDIO2
+#include <dxsdkver.h> /* XAudio2 exists as of the March 2008 DirectX SDK */
 #if (defined(_DXSDK_BUILD_MAJOR) && (_DXSDK_BUILD_MAJOR >= 1284))
 #   define SDL_HAVE_XAUDIO2_H 1
-#else
-#   define SDL_HAVE_XAUDIO2_H 0
+#endif
 #endif
 
-#if SDL_HAVE_XAUDIO2_H
+#ifdef SDL_HAVE_XAUDIO2_H
 #include <XAudio2.h>
 
 /* Hidden "this" pointer for the audio functions */