diff options
| author | coyot@coyot-sager-PC <coyot@coyot-sager-PC> | 2017-02-28 22:56:30 +0000 |
|---|---|---|
| committer | coyot@coyot-sager-PC <coyot@coyot-sager-PC> | 2017-02-28 22:56:30 +0000 |
| commit | 3a3da6e4a76859f32dc36491fde2992e92ae57b5 (patch) | |
| tree | f61a7417ad6ffcb8488c910cfa64f14afe979071 /indra/media_plugins/CMakeLists.txt | |
| parent | 069c938eb6ebfd77f6a415207331c66f72270e5f (diff) | |
| parent | f0b256b1cb6c96aed81ee456e505247fd2169c5f (diff) | |
merge
Diffstat (limited to 'indra/media_plugins/CMakeLists.txt')
| -rw-r--r-- | indra/media_plugins/CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/media_plugins/CMakeLists.txt b/indra/media_plugins/CMakeLists.txt index 24eb3947b4..1eadce825e 100644 --- a/indra/media_plugins/CMakeLists.txt +++ b/indra/media_plugins/CMakeLists.txt @@ -4,15 +4,15 @@ add_subdirectory(base) if (LINUX) add_subdirectory(gstreamer010) + add_subdirectory(libvlc) endif (LINUX) -if (WINDOWS OR DARWIN) - add_subdirectory(quicktime) +if (DARWIN) add_subdirectory(cef) -endif (WINDOWS OR DARWIN) + add_subdirectory(libvlc) +endif (DARWIN) if (WINDOWS) - add_subdirectory(winmmshim) + add_subdirectory(cef) + add_subdirectory(libvlc) endif (WINDOWS) - -### add_subdirectory(example) |