From f78332a2595ab6c26301914bd87a8f8c27e87a01 Mon Sep 17 00:00:00 2001
From: Soren Jorvang <soren.jorvang@gmail.com>
Date: Sun, 6 Jun 2010 21:14:56 +0000
Subject: [PATCH] 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
---
SConstruct | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/SConstruct b/SConstruct
index aaeccc236b..2cff174957 100644
--- a/SConstruct
+++ b/SConstruct
@@ -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')