From 404c625622c4e706dfed9a62b5480ee4d7a33544 Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Thu, 10 Jun 2010 14:18:21 +0000 Subject: Simplify the SCons build: On OS X, build all code as Objective-C(++). Centralize framework handling. Cleanup. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5645 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/AudioCommon/Src/SConscript | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'Source/Core/AudioCommon/Src/SConscript') diff --git a/Source/Core/AudioCommon/Src/SConscript b/Source/Core/AudioCommon/Src/SConscript index 746bea11f2..c64c7a581d 100644 --- a/Source/Core/AudioCommon/Src/SConscript +++ b/Source/Core/AudioCommon/Src/SConscript @@ -1,4 +1,3 @@ - # -*- python -*- Import('env') @@ -11,22 +10,19 @@ files = [ 'AudioCommon.cpp', ] -acenv = env.Clone() - -if acenv['HAVE_OPENAL']: +if env['HAVE_OPENAL']: files += [ 'OpenALStream.cpp', 'aldlist.cpp' ] -if acenv['HAVE_AO']: +if env['HAVE_AO']: files += [ 'AOSoundStream.cpp' ] -if acenv['HAVE_ALSA']: +if env['HAVE_ALSA']: files += [ 'AlsaSoundStream.cpp' ] -if acenv['HAVE_PULSEAUDIO']: +if env['HAVE_PULSEAUDIO']: files += [ 'PulseAudioStream.cpp' ] if sys.platform == 'darwin': files += [ 'CoreAudioSoundStream.cpp' ] - acenv['FRAMEWORKS'] = [ 'CoreAudio', 'AudioUnit' ] -acenv.StaticLibrary(env['local_libs'] + 'audiocommon', files) +env.StaticLibrary(env['local_libs'] + 'audiocommon', files) -- cgit v1.2.3