The openal and noao parameters are no longer necessary.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5631 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2010-06-06 21:14:56 +00:00
parent f4abbdf6b1
commit f78332a259

View File

@ -106,8 +106,6 @@ vars.AddVariables(
BoolVariable('bundle', 'Set to create bundle', False),
BoolVariable('lint', 'Set for lint build (extra warnings)', False),
BoolVariable('nowx', 'Set For Building with no WX libs', False),
BoolVariable('openal', 'Build with OpenAL', False),
BoolVariable('noao', 'Build without AO', False),
BoolVariable('wxgl', 'Set For Building with WX GL libs', False),
BoolVariable('opencl', 'Build with OpenCL', False),
BoolVariable('nojit', 'Remove entire jit cores', False),
@ -305,10 +303,8 @@ env['HAVE_OPENAL'] = 0
env['HAVE_PORTAUDIO'] = 0
env['HAVE_PULSEAUDIO'] = 0
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_AO'] = conf.CheckPKG('ao')
env['HAVE_OPENAL'] = conf.CheckPKG('openal')
env['HAVE_PORTAUDIO'] = conf.CheckPortaudio(1890)
env['HAVE_PULSEAUDIO'] = conf.CheckPKG('libpulse')