summaryrefslogtreecommitdiff
path: root/indra/media_plugins
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-22 16:50:26 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-22 16:50:26 +0000
commitf43a9a181ee0233adaed03a93190dc518ff0047f (patch)
treea0fcb46145b8f0e9e4233cbc4ab3510c6fd5f371 /indra/media_plugins
parent2a9232d307987b045dbeca898108aafc836ae0d6 (diff)
Do the necessary stuff to package pulseaudio's headers and make it (in theory, not yet in practice) optional.
Diffstat (limited to 'indra/media_plugins')
-rw-r--r--indra/media_plugins/webkit/CMakeLists.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt
index 3ab5522386..9f66a77c64 100644
--- a/indra/media_plugins/webkit/CMakeLists.txt
+++ b/indra/media_plugins/webkit/CMakeLists.txt
@@ -14,10 +14,12 @@ include(Linking)
include(PluginAPI)
include(MediaPluginBase)
include(FindOpenGL)
+include(PulseAudio)
include(WebKitLibPlugin)
include_directories(
+ ${PULSEAUDIO_INCLUDE_DIRS}
${LLPLUGIN_INCLUDE_DIRS}
${MEDIA_PLUGIN_BASE_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS}
@@ -40,6 +42,7 @@ set(media_plugin_webkit_LINK_LIBRARIES
${LLCOMMON_LIBRARIES}
${WEBKIT_PLUGIN_LIBRARIES}
${PLUGIN_API_WINDOWS_LIBRARIES}
+ ${PULSEAUDIO_LIBRARIES}
)
if (LINUX)