summaryrefslogtreecommitdiff
path: root/indra/media_plugins
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2016-06-02 14:00:36 -0700
committerCallum Prentice <callum@lindenlab.com>2016-06-02 14:00:36 -0700
commita24e24fb50e2bbf0a73ccd53ff2ba64124dabeba (patch)
tree526dc07621a65fd46c635ed875145a30c9e21432 /indra/media_plugins
parent4796f717c2a2c5756b91fa5281019ff23a10a613 (diff)
parent336121312b9ea30fcc46a033f3b6c4b23358ab1b (diff)
Merged in NickyD/viewer-release-vlc (pull request #2)
Linux media_plugin_libvlc
Diffstat (limited to 'indra/media_plugins')
-rw-r--r--indra/media_plugins/CMakeLists.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/media_plugins/CMakeLists.txt b/indra/media_plugins/CMakeLists.txt
index 6652bd021f..9055e0111a 100644
--- a/indra/media_plugins/CMakeLists.txt
+++ b/indra/media_plugins/CMakeLists.txt
@@ -4,6 +4,7 @@ add_subdirectory(base)
if (LINUX)
add_subdirectory(gstreamer010)
+ add_subdirectory(libvlc)
endif (LINUX)
if (DARWIN)