some build tweaks

indra/cmake/WebRTC.cmake

@@ -25,11 +25,11 @@ if (WINDOWS)
 elseif (DARWIN)
     FetchContent_Declare(
       webrtc
+      URL "https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.macos_x86_64.tar.bz2"
+      URL_HASH "MD5=cfbcac7da897a862f9791ea29330b814"
       FIND_PACKAGE_ARGS NAMES webrtc
       DOWNLOAD_EXTRACT_TIMESTAMP TRUE
       DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/"
-      URL "https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.macos_x86_64.tar.bz2"
-      URL_HASH "MD5=cfbcac7da897a862f9791ea29330b814"
     )
 endif (WINDOWS)
 

indra/llwebrtc/CMakeLists.txt

@@ -5,7 +5,9 @@ set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 
-set(CMAKE_GENERATOR_TOOLSET "CLangCL")
+if (WINDOWS)
+    set(CMAKE_GENERATOR_TOOLSET "CLangCL")
+endif (WINDOWS)
 
 include(00-Common)
 include(Linking)
@@ -52,10 +54,6 @@ target_include_directories( llwebrtc  INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
 if (WINDOWS)
     set_property(TARGET llwebrtc PROPERTY
         MSVC_RUNTIME_LIBRARY "MultiThreadedDebug")
-    ADD_CUSTOM_COMMAND(TARGET llwebrtc POST_BUILD
-                   COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                       $<TARGET_FILE:llwebrtc>
-                               ${SHARED_LIB_STAGING_DIR})
 endif (WINDOWS)
 
 ADD_CUSTOM_COMMAND(TARGET llwebrtc POST_BUILD

indra/newview/viewer_manifest.py

@@ -1004,6 +1004,12 @@ class Darwin_x86_64_Manifest(ViewerManifest):
                     ):
                         self.path(libfile)
 
+                        oldpath = os.path.join("@rpath", libfile)
+                        self.run_command(
+                            ['install_name_tool', '-change', oldpath,
+                             '@executable_path/../Resources/%s' % libfile,
+                             executable])
+
                 # dylibs is a list of all the .dylib files we expect to need
                 # in our bundled sub-apps. For each of these we'll create a
                 # symlink from sub-app/Contents/Resources to the real .dylib.

indra/secondlife-binRelWithDebInfo.entitlements

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.device.audio-input</key>
+	<true/>
+</dict>
+</plist>