summaryrefslogtreecommitdiff
path: root/indra/media_plugins/CMakeLists.txt
diff options
context:
space:
mode:
authorcallum_linden <none@none>2015-03-24 00:42:42 +0100
committercallum_linden <none@none>2015-03-24 00:42:42 +0100
commitab9e83030671f0d309eada847af7055213dfe501 (patch)
tree40f4ed2d4d84545dd9fad0b1e34969c6d2ffd4f0 /indra/media_plugins/CMakeLists.txt
parentd3477b738881acbdf2bd1cc7bfaadaaae3890be6 (diff)
Refer to new QuickTime third party package with fixes for VS2013 & re-add QuickTime media plugin
Diffstat (limited to 'indra/media_plugins/CMakeLists.txt')
-rwxr-xr-xindra/media_plugins/CMakeLists.txt8
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/media_plugins/CMakeLists.txt b/indra/media_plugins/CMakeLists.txt
index 85318aea3b..956e8fe890 100755
--- a/indra/media_plugins/CMakeLists.txt
+++ b/indra/media_plugins/CMakeLists.txt
@@ -2,9 +2,11 @@
add_subdirectory(base)
-add_subdirectory(webkit)
+### add_subdirectory(webkit)
-add_subdirectory(gstreamer010)
+if (LINUX)
+ add_subdirectory(gstreamer010)
+endif (LINUX)
if (WINDOWS OR DARWIN)
add_subdirectory(quicktime)
@@ -14,4 +16,4 @@ if (WINDOWS)
add_subdirectory(winmmshim)
endif (WINDOWS)
-add_subdirectory(example)
+### add_subdirectory(example)