summaryrefslogtreecommitdiff
path: root/indra/media_plugins
diff options
context:
space:
mode:
authorcallum_linden <none@none>2016-05-26 12:50:54 -0700
committercallum_linden <none@none>2016-05-26 12:50:54 -0700
commit70a38880faca24a9ed0a67606ef6bfd278ccd624 (patch)
tree0cf6d369d3465a31a694bed9651c5d90d82329a8 /indra/media_plugins
parent05fcb7c8126a3f3496d948affe7f2722c9ca8fad (diff)
Put back QuickTime plugin code for OS X only (untested - moving code to OS X dev)
Diffstat (limited to 'indra/media_plugins')
-rw-r--r--indra/media_plugins/CMakeLists.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/media_plugins/CMakeLists.txt b/indra/media_plugins/CMakeLists.txt
index 7ef29b9027..6652bd021f 100644
--- a/indra/media_plugins/CMakeLists.txt
+++ b/indra/media_plugins/CMakeLists.txt
@@ -6,11 +6,13 @@ if (LINUX)
add_subdirectory(gstreamer010)
endif (LINUX)
-if (WINDOWS OR DARWIN)
+if (DARWIN)
+ add_subdirectory(quicktime)
add_subdirectory(cef)
-endif (WINDOWS OR DARWIN)
+endif (DARWIN)
if (WINDOWS)
+ add_subdirectory(cef)
add_subdirectory(winmmshim)
add_subdirectory(libvlc)
endif (WINDOWS)