diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-12-18 10:44:42 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-12-18 10:44:42 -0500 |
| commit | 4b7ff25eba4b285e267ec6f766221ffcde82a808 (patch) | |
| tree | e8a885c7167046bec9311981a7f690a190248b2a /indra/media_plugins/CMakeLists.txt | |
| parent | d3b4f34eb7ff80315f1d714aa50bc7d7d33f9855 (diff) | |
| parent | 7b993d15b70d419dc0a7c8d92286d34a2635537d (diff) | |
merge changes for 4.0.0-release
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) |