Index: media/media.gyp |
diff --git a/media/media.gyp b/media/media.gyp |
index d93ad411cfd127c9f054076d06138df4f73ce6e0..25699b2d2b1780cb751332216c9f9b5d7378067b 100644 |
--- a/media/media.gyp |
+++ b/media/media.gyp |
@@ -5,6 +5,8 @@ |
{ |
'variables': { |
'chromium_code': 1, |
+ # Override to dynamically link the PulseAudio library. |
+ 'use_pulse_audio%': 0, |
}, |
'targets': [ |
{ |
@@ -56,6 +58,8 @@ |
'audio/linux/alsa_util.h', |
'audio/linux/alsa_wrapper.cc', |
'audio/linux/alsa_wrapper.h', |
+ 'audio/linux/pulse_output.cc', |
+ 'audio/linux/pulse_output.h', |
'audio/openbsd/audio_manager_openbsd.cc', |
'audio/openbsd/audio_manager_openbsd.h', |
'audio/mac/audio_input_mac.cc', |
@@ -197,7 +201,7 @@ |
'video/capture/win/pin_base_win.h', |
'video/capture/win/sink_filter_observer_win.h', |
'video/capture/win/sink_filter_win.cc', |
- 'video/capture/win/sink_filter_win.h', |
+ 'video/capture/win/sink_filter_win.h', |
'video/capture/win/sink_input_pin_win.cc', |
'video/capture/win/sink_input_pin_win.h', |
'video/capture/win/video_capture_device_win.cc', |
@@ -234,6 +238,15 @@ |
'-lasound', |
], |
}, |
+ 'conditions': [ |
+ ['use_pulse_audio == 1', { |
Paweł Hajdan Jr.
2011/08/08 20:43:40
Have you tested this on a system without PA? I thi
slock
2011/08/08 22:08:49
Done. Definitely, for the use-case of the person
|
+ 'link_settings' : { |
+ 'libraries' : [ |
+ '-lpulse', |
+ ], |
+ }, |
+ }], |
+ ], |
}], |
['OS=="openbsd"', { |
'sources/': [ ['exclude', 'alsa_' ], |