The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-04 03:46:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Small fixup

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2806 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2009-03-30 17:45:35 +00:00
parent 58a78cb2b5
commit ce7ee4d4a3
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/AudioCommon/Src/OpenALStream.h
View File

@ -18,10 +18,12 @@
#ifndef _OPENALSTREAM_H_ #ifndef _OPENALSTREAM_H_
#define _OPENALSTREAM_H_ #define _OPENALSTREAM_H_
#include "Common.h"
#include "SoundStream.h" #include "SoundStream.h"
#include "Thread.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/al.h"
#include "../../../../Externals/OpenAL/include/alc.h" #include "../../../../Externals/OpenAL/include/alc.h"
@ -32,7 +34,7 @@
class OpenALStream: public SoundStream class OpenALStream: public SoundStream
{ {
#ifdef HAVE_OPENAL && HAVE_OPENAL #if defined HAVE_OPENAL && HAVE_OPENAL
public: public:
OpenALStream(CMixer *mixer, void *hWnd = NULL): SoundStream(mixer) {}; OpenALStream(CMixer *mixer, void *hWnd = NULL): SoundStream(mixer) {};
virtual ~OpenALStream() {}; virtual ~OpenALStream() {};

16
Source/Core/AudioCommon/Src/SConscript
View File

@ -3,15 +3,19 @@
Import('env') Import('env')
files = [ files = [
'AOSoundStream.cpp',
'aldlist.cpp',
'AudioCommonConfig.cpp', 'AudioCommonConfig.cpp',
'OpenALStream.cpp',
'WaveFile.cpp', 'WaveFile.cpp',
'Mixer.cpp', 'Mixer.cpp',
'AudioCommon.cpp', 'AudioCommon.cpp',
] ]
env_audiocommon = env.Clone() acenv = env.Clone()
env_audiocommon.Append(CXXFLAGS = [ '-fPIC' ]) acenv.Append(CXXFLAGS = [ '-fPIC' ])
env_audiocommon.StaticLibrary('audiocommon', files)
if acenv['HAVE_OPENAL']:
files += [ 'OpenALStream.cpp', 'aldlist.cpp' ]
if acenv['HAVE_AO']:
files += [ 'AOSoundStream.cpp' ]
acenv.StaticLibrary('audiocommon', files)

1
Source/Core/Common/Src/Common.h
View File

@ -82,6 +82,7 @@
// Since they are always around on windows // Since they are always around on windows
#define HAVE_WIIUSE 1 #define HAVE_WIIUSE 1
#define HAVE_WX 1 #define HAVE_WX 1
#define HAVE_OPENAL 1
namespace namespace
{ {