diff options
| author | Techwolf Lupindo <bitbucket.org@trap.wereanimal.net> | 2010-08-22 19:20:29 -0400 |
|---|---|---|
| committer | Techwolf Lupindo <bitbucket.org@trap.wereanimal.net> | 2010-08-22 19:20:29 -0400 |
| commit | 1b27c4f9c762d68fae5b47dc08a31a2699ca9fe5 (patch) | |
| tree | 875642299e83ea29af6e131ac6000cc1d017fbd8 /indra/media_plugins | |
| parent | 81597463beb01fccd3e4bf9d7dea6bcdcd095115 (diff) | |
SNOW-599/SNOW-747: Pulseaudio should be optional on Linux.
Diffstat (limited to 'indra/media_plugins')
| -rw-r--r-- | indra/media_plugins/webkit/CMakeLists.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt index d576638dd7..6bb87ec306 100644 --- a/indra/media_plugins/webkit/CMakeLists.txt +++ b/indra/media_plugins/webkit/CMakeLists.txt @@ -53,6 +53,8 @@ set(media_plugin_webkit_LINK_LIBRARIES if (LINUX) if (PULSEAUDIO) list(APPEND media_plugin_webkit_SOURCE_FILES linux_volume_catcher.cpp) + else (PULSEAUDIO) + list(APPEND media_plugin_webkit_SOURCE_FILES dummy_volume_catcher.cpp) endif (PULSEAUDIO) list(APPEND media_plugin_webkit_LINK_LIBRARIES ${UI_LIBRARIES} # for glib/GTK @@ -67,9 +69,6 @@ elseif (DARWIN) ) elseif (WINDOWS) list(APPEND media_plugin_webkit_SOURCE_FILES windows_volume_catcher.cpp) -else (LINUX) - # All other platforms use the dummy volume catcher for now. - list(APPEND media_plugin_webkit_SOURCE_FILES dummy_volume_catcher.cpp) endif (LINUX) set_source_files_properties(${media_plugin_webkit_HEADER_FILES} |