From ce7ee4d4a3a0cdf77f6f386df68e315bebc97f7b Mon Sep 17 00:00:00 2001
From: nakeee <nakeee@gmail.com>
Date: Mon, 30 Mar 2009 17:45:35 +0000
Subject: [PATCH] Small fixup

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2806 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/AudioCommon/Src/OpenALStream.h |  6 ++++--
 Source/Core/AudioCommon/Src/SConscript     | 16 ++++++++++------
 Source/Core/Common/Src/Common.h            |  1 +
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Source/Core/AudioCommon/Src/OpenALStream.h b/Source/Core/AudioCommon/Src/OpenALStream.h
index a02e597399..129da8a27b 100644
--- a/Source/Core/AudioCommon/Src/OpenALStream.h
+++ b/Source/Core/AudioCommon/Src/OpenALStream.h
@@ -18,10 +18,12 @@
 #ifndef _OPENALSTREAM_H_
 #define _OPENALSTREAM_H_
 
+#include "Common.h"
 #include "SoundStream.h"
 #include "Thread.h"
 
-#ifdef HAVE_OPENAL && HAVE_OPENAL
+
+#if defined HAVE_OPENAL && HAVE_OPENAL
 #include "../../../../Externals/OpenAL/include/al.h"
 #include "../../../../Externals/OpenAL/include/alc.h"
 
@@ -32,7 +34,7 @@
 
 class OpenALStream: public SoundStream
 {
-#ifdef HAVE_OPENAL && HAVE_OPENAL
+#if defined HAVE_OPENAL && HAVE_OPENAL
 public:
 	OpenALStream(CMixer *mixer, void *hWnd = NULL): SoundStream(mixer) {};
 	virtual ~OpenALStream() {};
diff --git a/Source/Core/AudioCommon/Src/SConscript b/Source/Core/AudioCommon/Src/SConscript
index 4d493c8a26..e1282356e8 100644
--- a/Source/Core/AudioCommon/Src/SConscript
+++ b/Source/Core/AudioCommon/Src/SConscript
@@ -3,15 +3,19 @@
 Import('env')
 
 files = [
-    'AOSoundStream.cpp',
-    'aldlist.cpp',
     'AudioCommonConfig.cpp',
-    'OpenALStream.cpp',
     'WaveFile.cpp',
     'Mixer.cpp',
     'AudioCommon.cpp',
     ]
 
-env_audiocommon = env.Clone()
-env_audiocommon.Append(CXXFLAGS = [ '-fPIC' ])
-env_audiocommon.StaticLibrary('audiocommon', files)
+acenv = env.Clone()
+acenv.Append(CXXFLAGS = [ '-fPIC' ])
+
+if acenv['HAVE_OPENAL']:
+    files += [ 'OpenALStream.cpp', 'aldlist.cpp' ]
+    
+if acenv['HAVE_AO']:
+    files += [ 'AOSoundStream.cpp' ]
+    
+acenv.StaticLibrary('audiocommon', files)
diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h
index 4ef9e466c6..50ec42e73a 100644
--- a/Source/Core/Common/Src/Common.h
+++ b/Source/Core/Common/Src/Common.h
@@ -82,6 +82,7 @@
 // Since they are always around on windows
 	#define HAVE_WIIUSE 1
 	#define HAVE_WX 1
+	#define HAVE_OPENAL 1
 
 namespace
 {