From 9c1b4dee4497e20634e3e7416ba1989bef055014 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Tue, 1 Jun 2010 22:23:16 +0000 Subject: [PATCH] fix AudioCommon including linux headers on windows git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5568 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/AudioCommon/Src/OpenALStream.h | 6 ++++-- Source/Core/AudioCommon/Src/aldlist.cpp | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Source/Core/AudioCommon/Src/OpenALStream.h b/Source/Core/AudioCommon/Src/OpenALStream.h index 9db4559d55..1b56b2d6c1 100644 --- a/Source/Core/AudioCommon/Src/OpenALStream.h +++ b/Source/Core/AudioCommon/Src/OpenALStream.h @@ -18,7 +18,7 @@ #ifndef _OPENALSTREAM_H_ #define _OPENALSTREAM_H_ -#include "Common.h" +#include #include "SoundStream.h" #include "Thread.h" @@ -26,9 +26,11 @@ #ifdef _WIN32 #include "../../../../Externals/OpenAL/include/al.h" #include "../../../../Externals/OpenAL/include/alc.h" +#elif defined __linux__ #include #include -#endif // WIN32 +#endif + // 16 bit Stereo #define SFX_MAX_SOURCE 1 #define OAL_NUM_BUFFERS 16 diff --git a/Source/Core/AudioCommon/Src/aldlist.cpp b/Source/Core/AudioCommon/Src/aldlist.cpp index 9e9114cb81..7c7ce48318 100644 --- a/Source/Core/AudioCommon/Src/aldlist.cpp +++ b/Source/Core/AudioCommon/Src/aldlist.cpp @@ -22,14 +22,15 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "Common.h" +#include #include "aldlist.h" #ifdef _WIN32 #include "../../../../Externals/OpenAL/include/al.h" #include "../../../../Externals/OpenAL/include/alc.h" +#else // linux #include #include -#endif // WIN32 +#endif /*