piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 09:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Now that Core Audio works, reduce the number of build permutations a bit

Browse Source 
by not linking in other Unix audio modules.
 
Use kAudioUnitSubType_DefaultOutput instead of kAudioUnitSubType_HALOutput
so that a runtime switch to another audio device is automatically handled.
 
Use ERROR_LOG for audio errors.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5562 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2010-06-01 20:45:30 +00:00
parent f7494e6b2b
commit 9d7b569ccb
7 changed files with 24 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
SConstruct
View File

@ -288,29 +288,25 @@ env['HAVE_SDL'] = conf.CheckSDL('1.0.0')
env['HAVE_BLUEZ'] = conf.CheckPKG('bluez')
# needed for sound
env['HAVE_AO'] = 0
if not env['noao']:
env['HAVE_AO'] = conf.CheckPKG('ao')
env['HAVE_OPENAL'] = 0
if env['openal']:
env['HAVE_OPENAL'] = conf.CheckPKG('openal')
env['HAVE_ALSA'] = conf.CheckPKG('alsa')
env['HAVE_AO'] = 0
env['HAVE_OPENAL'] = 0
env['HAVE_PORTAUDIO'] = 0
env['HAVE_PULSEAUDIO'] = 0
#env['HAVE_PULSEAUDIO'] = conf.CheckPKG('libpulse')
if sys.platform != 'darwin':
if not env['noao']:
env['HAVE_AO'] = conf.CheckPKG('ao')
if env['openal']:
env['HAVE_OPENAL'] = conf.CheckPKG('openal')
env['HAVE_PORTAUDIO'] = conf.CheckPortaudio(1890)
#env['HAVE_PULSEAUDIO'] = conf.CheckPKG('libpulse')
# OpenCL
env['HAVE_OPENCL'] = 0
if env['opencl']:
env['HAVE_OPENCL'] = conf.CheckPKG('OpenCL')
env['HAVE_PORTAUDIO'] = 0
if sys.platform != 'darwin':
# needed for mic
env['HAVE_PORTAUDIO'] = conf.CheckPortaudio(1890)
# SOIL
env['SHARED_SOIL'] = 0;
if env['shared_soil']: