diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-12-18 13:55:41 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-12-18 13:55:41 -0500 |
| commit | 3f81bb15b32cfa9db2a1a3cbcf0eb976b7751368 (patch) | |
| tree | d534594be435e7cc1a5ca5c14b8b146ed47bb2e2 /indra/media_plugins/CMakeLists.txt | |
| parent | 99f4b27020c101591de5c1cbe53185c610e48caa (diff) | |
| parent | 7b993d15b70d419dc0a7c8d92286d34a2635537d (diff) | |
merge
Diffstat (limited to 'indra/media_plugins/CMakeLists.txt')
| -rwxr-xr-x | indra/media_plugins/CMakeLists.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/media_plugins/CMakeLists.txt b/indra/media_plugins/CMakeLists.txt index 85318aea3b..24eb3947b4 100755 --- a/indra/media_plugins/CMakeLists.txt +++ b/indra/media_plugins/CMakeLists.txt @@ -2,16 +2,17 @@ add_subdirectory(base) -add_subdirectory(webkit) - -add_subdirectory(gstreamer010) +if (LINUX) + add_subdirectory(gstreamer010) +endif (LINUX) if (WINDOWS OR DARWIN) add_subdirectory(quicktime) + add_subdirectory(cef) endif (WINDOWS OR DARWIN) if (WINDOWS) add_subdirectory(winmmshim) endif (WINDOWS) -add_subdirectory(example) +### add_subdirectory(example) |