diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2017-03-13 16:38:00 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2017-03-13 16:38:00 -0400 |
commit | 66de0c9965ff68bcb8cb60975fcffa45e2c6d74c (patch) | |
tree | e3fa6c87fe70e487b6fc6e94f6793b7638b568ea /indra/media_plugins/CMakeLists.txt | |
parent | 49e114748fdb52599aaa141c2006198c48aa083b (diff) | |
parent | 17c8eadb3d89bc78019f0b50eb8b109f25616781 (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/media_plugins/CMakeLists.txt')
-rw-r--r-- | indra/media_plugins/CMakeLists.txt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/media_plugins/CMakeLists.txt b/indra/media_plugins/CMakeLists.txt index 9055e0111a..1eadce825e 100644 --- a/indra/media_plugins/CMakeLists.txt +++ b/indra/media_plugins/CMakeLists.txt @@ -8,14 +8,11 @@ if (LINUX) endif (LINUX) if (DARWIN) - add_subdirectory(quicktime) add_subdirectory(cef) + add_subdirectory(libvlc) endif (DARWIN) if (WINDOWS) add_subdirectory(cef) - add_subdirectory(winmmshim) add_subdirectory(libvlc) endif (WINDOWS) - -### add_subdirectory(example) |