pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed compiling XAudio2 code with mingw64

Browse source
This commit is contained in:
Sam Lantinga 2013-05-26 12:20:23 -07:00
parent 07424fd0ca
commit 9ce206cdc0
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/audio/xaudio2/SDL_xaudio2.c
View file

@ -28,17 +28,22 @@
#include "../SDL_sysaudio.h" #include "../SDL_sysaudio.h"
#include "SDL_assert.h" #include "SDL_assert.h"
#ifdef __GNUC__
/* The configure script already did any necessary checking */
# define SDL_XAUDIO2_HAS_SDK 1
#else
#include <dxsdkver.h> /* XAudio2 exists as of the March 2008 DirectX SDK */ #include <dxsdkver.h> /* XAudio2 exists as of the March 2008 DirectX SDK */
#if (!defined(_DXSDK_BUILD_MAJOR) || (_DXSDK_BUILD_MAJOR < 1284)) #if (!defined(_DXSDK_BUILD_MAJOR) || (_DXSDK_BUILD_MAJOR < 1284))
# pragma message("Your DirectX SDK is too old. Disabling XAudio2 support.") # pragma message("Your DirectX SDK is too old. Disabling XAudio2 support.")
#else #else
# define SDL_XAUDIO2_HAS_SDK 1 # define SDL_XAUDIO2_HAS_SDK 1
#endif #endif
#endif /* __GNUC__ */
#ifdef SDL_XAUDIO2_HAS_SDK #ifdef SDL_XAUDIO2_HAS_SDK
#define INITGUID 1 #define INITGUID 1
#include <XAudio2.h> #include <xaudio2.h>
/* Hidden "this" pointer for the audio functions */ /* Hidden "this" pointer for the audio functions */
#define _THIS SDL_AudioDevice *this #define _THIS SDL_AudioDevice *this
@ -69,7 +74,6 @@ XAUDIO2_DetectDevices(int iscapture, SDL_AddAudioDevice addfn)
IXAudio2 *ixa2 = NULL; IXAudio2 *ixa2 = NULL;
UINT32 devcount = 0; UINT32 devcount = 0;
UINT32 i = 0; UINT32 i = 0;
void *ptr = NULL;
if (iscapture) { if (iscapture) {
SDL_SetError("XAudio2: capture devices unsupported."); SDL_SetError("XAudio2: capture devices unsupported.");