diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2012-05-16 09:27:37 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2012-05-16 09:27:37 +0200 |
| commit | fdff4cb1ffa76e894dd41ca5f97d31f122fd3f86 (patch) | |
| tree | 20059e8c98923d27f235c9f12de31be97e20240f /Source/Core/AudioCommon/SConscript | |
| parent | 2b77acc705eae11fdb4a25be6d6ea5db1fa52e21 (diff) | |
| parent | 5a8ad9230271a5088b0cf582932959214c6b5527 (diff) | |
Merge branch 'master' into wii-network
Conflicts:
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
Source/VSProps/Dolphin.Win32.props
Source/VSProps/Dolphin.x64.props
Diffstat (limited to 'Source/Core/AudioCommon/SConscript')
| -rw-r--r-- | Source/Core/AudioCommon/SConscript | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/Source/Core/AudioCommon/SConscript b/Source/Core/AudioCommon/SConscript deleted file mode 100644 index 5c953c4e58..0000000000 --- a/Source/Core/AudioCommon/SConscript +++ /dev/null @@ -1,29 +0,0 @@ -# -*- python -*- - -Import('env') -import sys - -files = [ - 'Src/AudioCommon.cpp', - 'Src/AudioCommonConfig.cpp', - 'Src/Mixer.cpp', - 'Src/NullSoundStream.cpp', - 'Src/WaveFile.cpp', - ] - -if sys.platform == 'darwin': - files += ['Src/CoreAudioSoundStream.cpp'] -elif sys.platform == 'win32': - files += ['Src/DSoundStream.cpp'] - files += ['Src/XAudio2Stream.cpp'] -else: - if env['HAVE_ALSA']: - files += ['Src/AlsaSoundStream.cpp'] - if env['HAVE_AO']: - files += ['Src/AOSoundStream.cpp'] - if env['HAVE_OPENAL']: - files += ['Src/OpenALStream.cpp', 'Src/aldlist.cpp'] - if env['HAVE_PULSEAUDIO']: - files += ['Src/PulseAudioStream.cpp'] - -env['LIBS'] += env.StaticLibrary('audiocommon', files) |