generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

exclude pulse audio when building with Chromium.

Browse Source 
BUG=none
TEST=local
Review URL: http://webrtc-codereview.appspot.com/91001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@240 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
wjia@google.com 2011-07-21 20:45:31 +00:00
parent 1b43b6d416
commit 647aa16f0d
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/build/common.gypi
View File

@ -25,6 +25,13 @@
'direct_show_base_classes': 'direct_show_base_classes':
'C:/Program Files/Microsoft SDKs/Windows/v7.1/Samples/multimedia/directshow/baseclasses/', 'C:/Program Files/Microsoft SDKs/Windows/v7.1/Samples/multimedia/directshow/baseclasses/',
}], }],
['build_with_chromium==1', {
# Exclude pulse audio on Chromium since its prerequisites don't
# include pulse audio.
'include_pulse_audio%': 0,
}, {
'include_pulse_audio%': 1,
}],
], # conditions ], # conditions
}, },
'target_defaults': { 'target_defaults': {

34
src/modules/audio_device/main/source/audio_device.gyp
View File

@ -52,18 +52,12 @@
'Linux/alsasymboltable.h', 'Linux/alsasymboltable.h',
'Linux/audio_device_linux_alsa.cc', 'Linux/audio_device_linux_alsa.cc',
'Linux/audio_device_linux_alsa.h', 'Linux/audio_device_linux_alsa.h',
'Linux/audio_device_linux_pulse.cc',
'Linux/audio_device_linux_pulse.h',
'Linux/audio_device_utility_linux.cc', 'Linux/audio_device_utility_linux.cc',
'Linux/audio_device_utility_linux.h', 'Linux/audio_device_utility_linux.h',
'Linux/audio_mixer_manager_linux_alsa.cc', 'Linux/audio_mixer_manager_linux_alsa.cc',
'Linux/audio_mixer_manager_linux_alsa.h', 'Linux/audio_mixer_manager_linux_alsa.h',
'Linux/audio_mixer_manager_linux_pulse.cc',
'Linux/audio_mixer_manager_linux_pulse.h',
'Linux/latebindingsymboltable.cc', 'Linux/latebindingsymboltable.cc',
'Linux/latebindingsymboltable.h', 'Linux/latebindingsymboltable.h',
'Linux/pulseaudiosymboltable.cc',
'Linux/pulseaudiosymboltable.h',
'Mac/audio_device_mac.cc', 'Mac/audio_device_mac.cc',
'Mac/audio_device_mac.h', 'Mac/audio_device_mac.h',
'Mac/audio_device_utility_mac.cc', 'Mac/audio_device_utility_mac.cc',
@ -89,16 +83,10 @@
'Linux/alsasymboltable.h', 'Linux/alsasymboltable.h',
'Linux/audio_device_linux_alsa.cc', 'Linux/audio_device_linux_alsa.cc',
'Linux/audio_device_linux_alsa.h', 'Linux/audio_device_linux_alsa.h',
'Linux/audio_device_linux_pulse.cc',
'Linux/audio_device_linux_pulse.h',
'Linux/audio_mixer_manager_linux_alsa.cc', 'Linux/audio_mixer_manager_linux_alsa.cc',
'Linux/audio_mixer_manager_linux_alsa.h', 'Linux/audio_mixer_manager_linux_alsa.h',
'Linux/audio_mixer_manager_linux_pulse.cc',
'Linux/audio_mixer_manager_linux_pulse.h',
'Linux/latebindingsymboltable.cc', 'Linux/latebindingsymboltable.cc',
'Linux/latebindingsymboltable.h', 'Linux/latebindingsymboltable.h',
'Linux/pulseaudiosymboltable.cc',
'Linux/pulseaudiosymboltable.h',
# Don't remove these, needed for dummy device # Don't remove these, needed for dummy device
# 'Linux/audio_device_utility_linux.cc', # 'Linux/audio_device_utility_linux.cc',
# 'Linux/audio_device_utility_linux.h', # 'Linux/audio_device_utility_linux.h',
@ -131,7 +119,6 @@
}], }],
['OS=="linux"', { ['OS=="linux"', {
'defines': [ 'defines': [
'LINUX_PULSE',
'LINUX_ALSA', 'LINUX_ALSA',
], ],
'include_dirs': [ 'include_dirs': [
@ -141,9 +128,28 @@
'libraries': [ 'libraries': [
'-ldl', '-ldl',
'-lasound', '-lasound',
'-lpulse',
], ],
}, },
'conditions': [
['include_pulse_audio==1', {
'defines': [
'LINUX_PULSE',
],
'sources': [
'Linux/audio_device_linux_pulse.cc',
'Linux/audio_device_linux_pulse.h',
'Linux/audio_mixer_manager_linux_pulse.cc',
'Linux/audio_mixer_manager_linux_pulse.h',
'Linux/pulseaudiosymboltable.cc',
'Linux/pulseaudiosymboltable.h',
],
'link_settings': {
'libraries': [
'-lpulse',
],
},
}],
],
}], }],
['OS=="mac"', { ['OS=="mac"', {
'include_dirs': [ 'include_dirs': [