summaryrefslogtreecommitdiff
path: root/indra/media_plugins/CMakeLists.txt
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2024-06-20 16:16:37 +0800
committerErik Kundiman <erik@megapahit.org>2024-06-20 20:52:45 +0800
commitad5dec92bcb7d11e6a48b6ec6a220a49de985351 (patch)
tree3870c4c7f1c9521c6ad40d1cfe1b1d8fc39882ef /indra/media_plugins/CMakeLists.txt
parent16299d3a3631e4c42367cf40410ad6995e585384 (diff)
parenta65bc46b138b89200586b29fe729cbc7b0f0c8c4 (diff)
Merge remote-tracking branch 'secondlife/release/maint-b' into maint-b
Diffstat (limited to 'indra/media_plugins/CMakeLists.txt')
-rw-r--r--indra/media_plugins/CMakeLists.txt12
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/media_plugins/CMakeLists.txt b/indra/media_plugins/CMakeLists.txt
index 20a8a74042..9d52b4314f 100644
--- a/indra/media_plugins/CMakeLists.txt
+++ b/indra/media_plugins/CMakeLists.txt
@@ -3,15 +3,21 @@
add_subdirectory(base)
if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
- add_subdirectory(libvlc)
add_subdirectory(example)
+ add_subdirectory(gstreamer10)
endif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-if (DARWIN OR LINUX)
+if (LINUX)
+ add_subdirectory(cef)
+ add_subdirectory(example)
+ add_subdirectory(gstreamer10)
+endif (LINUX)
+
+if (DARWIN)
add_subdirectory(cef)
add_subdirectory(libvlc)
add_subdirectory(example)
-endif (DARWIN OR LINUX)
+endif (DARWIN)
if (WINDOWS)
add_subdirectory(cef)