aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorJacek Antonelli2010-11-13 15:30:07 -0600
committerJacek Antonelli2010-11-13 15:30:07 -0600
commit99817b5eaf819ad689192eab5adf1589ca38afa6 (patch)
treeb21f93e91db258db1f52578fce0f33eb24724f05 /linden/indra
parentGStreamer010 plugin needs Carbon.h on Mac. (diff)
downloadmeta-impy-99817b5eaf819ad689192eab5adf1589ca38afa6.zip
meta-impy-99817b5eaf819ad689192eab5adf1589ca38afa6.tar.gz
meta-impy-99817b5eaf819ad689192eab5adf1589ca38afa6.tar.bz2
meta-impy-99817b5eaf819ad689192eab5adf1589ca38afa6.tar.xz
Use Quicktime plugin on Mac, not GStreamer.
Diffstat (limited to 'linden/indra')
-rwxr-xr-xlinden/indra/media_plugins/CMakeLists.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/media_plugins/CMakeLists.txt b/linden/indra/media_plugins/CMakeLists.txt
index c4f2555..a4c6b18 100755
--- a/linden/indra/media_plugins/CMakeLists.txt
+++ b/linden/indra/media_plugins/CMakeLists.txt
@@ -4,12 +4,12 @@ add_subdirectory(base)
4 4
5add_subdirectory(webkit) 5add_subdirectory(webkit)
6 6
7if (LINUX OR DARWIN) 7if (LINUX)
8 add_subdirectory(gstreamer010) 8 add_subdirectory(gstreamer010)
9endif (LINUX OR DARWIN) 9endif (LINUX)
10 10
11if (WINDOWS) 11if (WINDOWS OR DARWIN)
12 add_subdirectory(quicktime) 12 add_subdirectory(quicktime)
13endif (WINDOWS) 13endif (WINDOWS OR DARWIN)
14 14
15add_subdirectory(example) 15add_subdirectory(example)