3 files changed, 24 insertions, 2 deletions
diff --git a/indra/llwebrtc/CMakeLists.txt b/indra/llwebrtc/CMakeLists.txt
index fd1788c5d4..b7adc91c2a 100644
--- a/indra/llwebrtc/CMakeLists.txt
+++ b/indra/llwebrtc/CMakeLists.txt
@@ -59,3 +59,16 @@ ADD_CUSTOM_COMMAND(TARGET llwebrtc POST_BUILD
 # Add tests
 if (LL_TESTS)
 endif (LL_TESTS)
+
+if (INSTALL)
+    if (DARWIN)
+        set(_LIB ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources)
+    elseif (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu)
+        set(_LIB lib/${ARCH}-linux-gnu)
+    elseif (EXISTS /lib64)
+        set(_LIB lib64)
+    else (DARWIN)
+        set(_LIB lib)
+    endif (DARWIN)
+    install(TARGETS ${PROJECT_NAME} DESTINATION ${_LIB})
+endif (INSTALL)
diff --git a/indra/llwebrtc/llwebrtc.cpp b/indra/llwebrtc/llwebrtc.cpp
index 2c890acbdb..e533783d33 100644
--- a/indra/llwebrtc/llwebrtc.cpp
+++ b/indra/llwebrtc/llwebrtc.cpp
@@ -203,7 +203,9 @@ void LLWebRTCImpl::init()
             mTuningDeviceModule->SetPlayoutDevice(mPlayoutDevice);
             mTuningDeviceModule->SetRecordingDevice(mRecordingDevice);
             mTuningDeviceModule->EnableBuiltInAEC(false);
+#if __x86_64__ && !__FreeBSD__
             mTuningDeviceModule->SetAudioDeviceSink(this);
+#endif
             mTuningDeviceModule->InitMicrophone();
             mTuningDeviceModule->InitSpeaker();
             mTuningDeviceModule->InitRecording();
diff --git a/indra/llwebrtc/llwebrtc_impl.h b/indra/llwebrtc/llwebrtc_impl.h
index c5b32123eb..bc9b7762dd 100644
--- a/indra/llwebrtc/llwebrtc_impl.h
+++ b/indra/llwebrtc/llwebrtc_impl.h
@@ -184,7 +184,10 @@ class LLCustomProcessor : public webrtc::CustomProcessing
 
 // Primary singleton implementation for interfacing
 // with the native webrtc library.
-class LLWebRTCImpl : public LLWebRTCDeviceInterface, public webrtc::AudioDeviceSink
+class LLWebRTCImpl : public LLWebRTCDeviceInterface
+#if __x86_64__ && !__FreeBSD__
+    , public webrtc::AudioDeviceSink
+#endif
 {
   public:
     LLWebRTCImpl(LLWebRTCLogCallback* logCallback);
@@ -219,7 +222,11 @@ class LLWebRTCImpl : public LLWebRTCDeviceInterface, public webrtc::AudioDeviceS
     //
     // AudioDeviceSink
     //
-    void OnDevicesUpdated() override;
+    void OnDevicesUpdated()
+#if __x86_64__ && !__FreeBSD__
+            override
+#endif
+            ;
 
     //
     // Helpers