diff options
| author | callum@lindenlab.com <callum@lindenlab.com> | 2017-04-28 13:48:36 -0700 |
|---|---|---|
| committer | callum@lindenlab.com <callum@lindenlab.com> | 2017-04-28 13:48:36 -0700 |
| commit | 0c9758820c838eb84c5f334c99f1fc6d92a2b740 (patch) | |
| tree | f18366d3887016f53f1688ab58e4f2eb77b57309 /indra/media_plugins/cef/CMakeLists.txt | |
| parent | 8f95d9ad6e4a5eb9d0556adb89eef613458f7c72 (diff) | |
Add NULL macOs implementation for 'MAINT-6950 Shared media a great distance away (different region even) sometimes plays at maximum volume when entering a region or moving camera slightly.' - until we can understand how to make real mac_volume_catcher work
Diffstat (limited to 'indra/media_plugins/cef/CMakeLists.txt')
| -rw-r--r-- | indra/media_plugins/cef/CMakeLists.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt index be3cec19c6..5452fd9d1e 100644 --- a/indra/media_plugins/cef/CMakeLists.txt +++ b/indra/media_plugins/cef/CMakeLists.txt @@ -57,9 +57,21 @@ set (media_plugin_cef_LINK_LIBRARIES ${LLCOMMON_LIBRARIES} ${PLUGIN_API_WINDOWS_LIBRARIES}) -if (WINDOWS) +# Select which VolumeCatcher implementation to use +if (LINUX) + message(FATAL_ERROR "CEF plugin has been enabled for a Linux compile.\n" + " Please create a volume_catcher implementation for this platform.") +elseif (DARWIN) + list(APPEND media_plugin_cef_SOURCE_FILES mac_volume_catcher_null.cpp) + find_library(CORESERVICES_LIBRARY CoreServices) + find_library(AUDIOUNIT_LIBRARY AudioUnit) + list(APPEND media_plugin_cef_LINK_LIBRARIES + ${CORESERVICES_LIBRARY} # for Component Manager calls + ${AUDIOUNIT_LIBRARY} # for AudioUnit calls + ) +elseif (WINDOWS) list(APPEND media_plugin_cef_SOURCE_FILES windows_volume_catcher.cpp) -endif (WINDOWS) +endif (LINUX) set_source_files_properties(${media_plugin_cef_HEADER_FILES} PROPERTIES HEADER_FILE_ONLY TRUE) |