Update dependencies with support for apple silicon

23 files changed, 320 insertions, 326 deletions

diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index 97b316c4c7..e0807a7d19 100644
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -9,35 +9,25 @@ use_system_binary( apr apr-util )
 use_prebuilt_binary(apr_suite)
 
 if (WINDOWS)
-  if (LLCOMMON_LINK_SHARED)
-    set(APR_selector "lib")
-  else (LLCOMMON_LINK_SHARED)
-    set(APR_selector "")
-  endif (LLCOMMON_LINK_SHARED)
-  target_link_libraries( ll::apr INTERFACE
-          ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}apr-1.lib
-          ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}aprutil-1.lib
-          )
-  target_compile_definitions( ll::apr INTERFACE APR_DECLARE_STATIC=1 APU_DECLARE_STATIC=1 API_DECLARE_STATIC=1)
-elseif (DARWIN)
-  if (LLCOMMON_LINK_SHARED)
-    set(APR_selector     "0.dylib")
-    set(APRUTIL_selector "0.dylib")
-  else (LLCOMMON_LINK_SHARED)
-    set(APR_selector     "a")
-    set(APRUTIL_selector "a")
-  endif (LLCOMMON_LINK_SHARED)
-
-  target_link_libraries( ll::apr INTERFACE
-          ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.${APR_selector}
-          ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.${APR_selector}
-          iconv
-          )
-else()
-  target_link_libraries( ll::apr INTERFACE
-          ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.a
-          ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.a
-          rt
-          )
+  target_compile_definitions(ll::apr INTERFACE APR_DECLARE_STATIC=1 APU_DECLARE_STATIC=1 API_DECLARE_STATIC=1)
 endif ()
-target_include_directories( ll::apr SYSTEM INTERFACE  ${LIBS_PREBUILT_DIR}/include/apr-1 )
+
+find_library(APR_LIBRARY
+    NAMES
+    apr-1.lib
+    libapr-1.a
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+find_library(APRUTIL_LIBRARY
+    NAMES
+    aprutil-1.lib
+    libaprutil-1.a
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+target_link_libraries(ll::apr INTERFACE ${APR_LIBRARY} ${APRUTIL_LIBRARY})
+
+if(DARWIN)
+  target_link_libraries(ll::apr INTERFACE iconv)
+endif()
+
+target_include_directories(ll::apr SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/apr-1)
diff --git a/indra/cmake/Audio.cmake b/indra/cmake/Audio.cmake
index 8c82749cab..6f61b056e0 100644
--- a/indra/cmake/Audio.cmake
+++ b/indra/cmake/Audio.cmake
@@ -9,23 +9,29 @@ use_system_binary(vorbis)
 use_prebuilt_binary(ogg_vorbis)
 target_include_directories( ll::vorbis SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include )
 
-if (WINDOWS)
-  target_link_libraries(ll::vorbis INTERFACE
-        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libogg.lib
-        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libogg.lib
-        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbisenc.lib
-        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libvorbisenc.lib
-        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbisfile.lib
-        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libvorbisfile.lib
-        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbis.lib
-        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libvorbis.lib
-    )
-else (WINDOWS)
-  target_link_libraries(ll::vorbis INTERFACE
-        ${ARCH_PREBUILT_DIRS_RELEASE}/libogg.a
-        ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbisenc.a
-        ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbisfile.a
-        ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbis.a
-        )
-endif (WINDOWS)
+find_library(OGG_LIBRARY
+    NAMES
+    libogg.lib
+    libogg.a
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+find_library(VORBIS_LIBRARY
+    NAMES
+    libvorbis.lib
+    libvorbis.a
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+find_library(VORBISENC_LIBRARY
+    NAMES
+    libvorbisenc.lib
+    libvorbisenc.a
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+find_library(VORBISFILE_LIBRARY
+    NAMES
+    libvorbisfile.lib
+    libvorbisfile.a
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+target_link_libraries(ll::vorbis INTERFACE ${OGG_LIBRARY} ${VORBISENC_LIBRARY} ${VORBISFILE_LIBRARY} ${VORBIS_LIBRARY})
 
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 8c5b946753..518e678585 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -16,41 +16,65 @@ use_prebuilt_binary(boost)
 # with the address size.
 set(addrsfx "-x${ADDRESS_SIZE}")
 
-if (WINDOWS)
-  target_link_libraries( ll::boost INTERFACE
-          libboost_context-mt${addrsfx}
-          libboost_fiber-mt${addrsfx}
-          libboost_filesystem-mt${addrsfx}
-          libboost_program_options-mt${addrsfx}
-          libboost_regex-mt${addrsfx}
-          libboost_system-mt${addrsfx}
-          libboost_thread-mt${addrsfx}
-          libboost_url-mt${addrsfx})
-elseif (LINUX)
-  target_link_libraries( ll::boost INTERFACE
-          boost_context-mt${addrsfx}
-          boost_fiber-mt${addrsfx}
-          boost_filesystem-mt${addrsfx}
-          boost_program_options-mt${addrsfx}
-          boost_regex-mt${addrsfx}
-          boost_signals-mt${addrsfx}
-          boost_system-mt${addrsfx}
-          boost_thread-mt${addrsfx}
-          boost_url-mt${addrsfx})
-elseif (DARWIN)
-  target_link_libraries( ll::boost INTERFACE
-          boost_context-mt${addrsfx}
-          boost_fiber-mt${addrsfx}
-          boost_filesystem-mt${addrsfx}
-          boost_program_options-mt${addrsfx}
-          boost_regex-mt${addrsfx}
-          boost_system-mt${addrsfx}
-          boost_thread-mt${addrsfx}
-          boost_url-mt${addrsfx})
-endif (WINDOWS)
+find_library(BOOST_CONTEXT_LIBRARY
+    NAMES
+    boost_context-mt
+    boost_context-mt${addrsfx}
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+find_library(BOOST_FIBER_LIBRARY
+    NAMES
+    boost_fiber-mt
+    boost_fiber-mt${addrsfx}
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+find_library(BOOST_FILESYSTEM_LIBRARY
+    NAMES
+    boost_filesystem-mt
+    boost_filesystem-mt${addrsfx}
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+find_library(BOOST_PROGRAMOPTIONS_LIBRARY
+    NAMES
+    boost_program_options-mt
+    boost_program_options-mt${addrsfx}
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+find_library(BOOST_REGEX_LIBRARY
+    NAMES
+    boost_regex-mt
+    boost_regex-mt${addrsfx}
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+find_library(BOOST_SYSTEM_LIBRARY
+    NAMES
+    boost_system-mt
+    boost_system-mt${addrsfx}
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+find_library(BOOST_THREAD_LIBRARY
+    NAMES
+    boost_thread-mt
+    boost_thread-mt${addrsfx}
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+find_library(BOOST_URL_LIBRARY
+    NAMES
+    boost_url-mt
+    boost_url-mt${addrsfx}
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+target_link_libraries(ll::boost INTERFACE
+    ${BOOST_CONTEXT_LIBRARY}
+    ${BOOST_FIBER_LIBRARY}
+    ${BOOST_FILESYSTEM_LIBRARY}
+    ${BOOST_PROGRAMOPTIONS_LIBRARY}
+    ${BOOST_REGEX_LIBRARY}
+    ${BOOST_SYSTEM_LIBRARY}
+    ${BOOST_THREAD_LIBRARY}
+    ${BOOST_URL_LIBRARY})
 
 if (LINUX)
-    set(BOOST_SYSTEM_LIBRARY ${BOOST_SYSTEM_LIBRARY} rt)
-    set(BOOST_THREAD_LIBRARY ${BOOST_THREAD_LIBRARY} rt)
+    target_link_libraries(ll::boost INTERFACE rt)
 endif (LINUX)
 
diff --git a/indra/cmake/CURL.cmake b/indra/cmake/CURL.cmake
index eea0a2da62..b1595d57a8 100644
--- a/indra/cmake/CURL.cmake
+++ b/indra/cmake/CURL.cmake
@@ -7,19 +7,13 @@ add_library( ll::libcurl INTERFACE IMPORTED )
 
 use_system_binary(libcurl)
 use_prebuilt_binary(curl)
-if (WINDOWS)
-  target_link_libraries(ll::libcurl INTERFACE
-    ${ARCH_PREBUILT_DIRS_RELEASE}/libcurl.lib
-    ll::openssl
-    ll::nghttp2
-    ll::zlib-ng
-    )
-else ()
-  target_link_libraries(ll::libcurl INTERFACE
-    ${ARCH_PREBUILT_DIRS_RELEASE}/libcurl.a
-    ll::openssl
-    ll::nghttp2
-    ll::zlib-ng
-    )
-endif ()
+
+find_library(CURL_LIBRARY
+    NAMES
+    libcurl.lib
+    libcurl.a
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+target_link_libraries(ll::libcurl INTERFACE ${CURL_LIBRARY} ll::openssl ll::nghttp2 ll::zlib-ng)
+
 target_include_directories( ll::libcurl SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include)
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 6ac00fd131..2ac82308cf 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -56,11 +56,6 @@ if(WINDOWS)
         openjp2.dll
         )
 
-    if(LLCOMMON_LINK_SHARED)
-        set(release_files ${release_files} libapr-1.dll)
-        set(release_files ${release_files} libaprutil-1.dll)
-    endif()
-
     # Filenames are different for 32/64 bit BugSplat file and we don't
     # have any control over them so need to branch.
     if (USE_BUGSPLAT)
@@ -171,15 +166,6 @@ elseif(DARWIN)
         libndofdev.dylib
        )
 
-    if(LLCOMMON_LINK_SHARED)
-        set(release_files ${release_files}
-            libapr-1.0.dylib
-            libapr-1.dylib
-            libaprutil-1.0.dylib
-            libaprutil-1.dylib
-            )
-    endif()
-
     if (TARGET ll::openal)
       list(APPEND release_files libalut.dylib libopenal.dylib)
     endif ()
@@ -225,13 +211,6 @@ elseif(LINUX)
                  libgmodule-2.0.so
                  libgobject-2.0.so
                  )
-
-        if(LLCOMMON_LINK_SHARED)
-            set(release_files ${release_files}
-                libapr-1.so.0
-                libaprutil-1.so.0
-                )
-        endif()
      endif()
 
 else(WINDOWS)
diff --git a/indra/cmake/EXPAT.cmake b/indra/cmake/EXPAT.cmake
index 1a0b8789dc..fe6dced795 100644
--- a/indra/cmake/EXPAT.cmake
+++ b/indra/cmake/EXPAT.cmake
@@ -2,18 +2,21 @@
 include(Prebuilt)
 
 include_guard()
-add_library( ll::expat INTERFACE IMPORTED )
+add_library(ll::expat INTERFACE IMPORTED)
 
 use_system_binary(expat)
 use_prebuilt_binary(expat)
+
 if (WINDOWS)
-    target_compile_definitions( ll::expat INTERFACE XML_STATIC=1)
-    target_link_libraries( ll::expat  INTERFACE
-            debug ${ARCH_PREBUILT_DIRS_DEBUG}/libexpatd.lib
-            optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libexpat.lib)
-else ()
-    target_link_libraries( ll::expat  INTERFACE
-            debug ${ARCH_PREBUILT_DIRS_DEBUG}/libexpat.a
-            optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libexpat.a)
+    target_compile_definitions(ll::expat INTERFACE XML_STATIC=1)
 endif ()
-target_include_directories( ll::expat SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include )
+
+find_library(EXPAT_LIBRARY
+    NAMES
+    libexpat.lib
+    libexpat.a
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+target_link_libraries(ll::expat INTERFACE ${EXPAT_LIBRARY})
+
+target_include_directories(ll::expat SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include)
diff --git a/indra/cmake/FreeType.cmake b/indra/cmake/FreeType.cmake
index 563491556d..3c635e851b 100644
--- a/indra/cmake/FreeType.cmake
+++ b/indra/cmake/FreeType.cmake
@@ -9,9 +9,10 @@ use_system_binary(freetype)
 use_prebuilt_binary(freetype)
 target_include_directories( ll::freetype SYSTEM INTERFACE  ${LIBS_PREBUILT_DIR}/include/freetype2/)
 
-if (WINDOWS)
-    target_link_libraries( ll::freetype INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/freetype.lib)
-else()
-    target_link_libraries( ll::freetype INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libfreetype.a)
-endif()
+find_library(FREETYPE_LIBRARY
+    NAMES
+    freetype.lib
+    libfreetype.a
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
 
+target_link_libraries(ll::freetype INTERFACE ${FREETYPE_LIBRARY})
diff --git a/indra/cmake/Hunspell.cmake b/indra/cmake/Hunspell.cmake
index 129679febd..b063363bc0 100644
--- a/indra/cmake/Hunspell.cmake
+++ b/indra/cmake/Hunspell.cmake
@@ -8,17 +8,17 @@ use_prebuilt_binary(dictionaries)
 add_library( ll::hunspell INTERFACE IMPORTED )
 use_system_binary(hunspell)
 use_prebuilt_binary(libhunspell)
+
 if (WINDOWS)
     target_compile_definitions( ll::hunspell INTERFACE HUNSPELL_STATIC=1)
-    target_link_libraries( ll::hunspell INTERFACE
-        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libhunspell.lib
-        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libhunspell.lib
-        )
-elseif(DARWIN)
-    target_link_libraries( ll::hunspell INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libhunspell-1.7.a
-        )
-elseif(LINUX)
-    target_link_libraries( ll::hunspell INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libhunspell-1.7.a
-        )
 endif()
+
+find_library(HUNSPELL_LIBRARY
+    NAMES
+    libhunspell.lib
+    libhunspell-1.7.a
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+target_link_libraries(ll::hunspell INTERFACE ${HUNSPELL_LIBRARY})
+
 target_include_directories( ll::hunspell SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/hunspell)
diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake
index ade5a070cc..f864ca7f8d 100644
--- a/indra/cmake/JPEG.cmake
+++ b/indra/cmake/JPEG.cmake
@@ -8,13 +8,13 @@ add_library( ll::libjpeg INTERFACE IMPORTED )
 
 use_system_binary(libjpeg)
 use_prebuilt_binary(libjpeg-turbo)
-if (LINUX)
-  target_link_libraries( ll::libjpeg INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libjpeg.a)
-elseif (DARWIN)
-  target_link_libraries( ll::libjpeg INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libjpeg.a)
-elseif (WINDOWS)
-    target_link_libraries( ll::libjpeg INTERFACE
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/jpeg.lib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/jpeg.lib)
-endif (LINUX)
-target_include_directories( ll::libjpeg SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include)
+
+find_library(JPEG_LIBRARY
+    NAMES
+    jpeg.lib
+    libjpeg.a
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+target_link_libraries(ll::libjpeg INTERFACE ${JPEG_LIBRARY})
+
+target_include_directories(ll::libjpeg SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include)
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
index d0a52ffb63..2699f8efee 100644
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -24,26 +24,35 @@ use_prebuilt_binary(colladadom)
 use_prebuilt_binary(minizip-ng) # needed for colladadom
 use_prebuilt_binary(libxml2)
 
-if (WINDOWS)
-    target_link_libraries( ll::minizip-ng INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/minizip.lib )
-else()
-    target_link_libraries( ll::minizip-ng INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libminizip.a )
-endif()
+find_library(MINIZIPNG_LIBRARY
+    NAMES
+    minizip.lib
+    libminizip.a
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+target_link_libraries(ll::minizip-ng INTERFACE ${MINIZIPNG_LIBRARY})
+
+find_library(LIBXML2_LIBRARY
+    NAMES
+    libxml2.lib
+    libxml2.a
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+target_link_libraries(ll::libxml INTERFACE ${LIBXML2_LIBRARY})
 
 if (WINDOWS)
-    target_link_libraries( ll::libxml INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libxml2.lib Bcrypt.lib)
-else()
-    target_link_libraries( ll::libxml INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libxml2.a)
+    target_link_libraries( ll::libxml INTERFACE Bcrypt.lib)
 endif()
 
 target_include_directories( ll::colladadom SYSTEM INTERFACE
         ${LIBS_PREBUILT_DIR}/include/collada
         ${LIBS_PREBUILT_DIR}/include/collada/1.4
         )
-if (WINDOWS)
-    target_link_libraries(ll::colladadom INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libcollada14dom23-s.lib ll::libxml ll::minizip-ng )
-elseif (DARWIN)
-    target_link_libraries(ll::colladadom INTERFACE collada14dom ll::boost ll::libxml ll::minizip-ng)
-elseif (LINUX)
-    target_link_libraries(ll::colladadom INTERFACE collada14dom ll::boost ll::libxml ll::minizip-ng)
-endif()
+
+find_library(COLLADADOM_LIBRARY
+    NAMES
+    libcollada14dom23-s.lib
+    collada14dom
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+target_link_libraries(ll::colladadom INTERFACE ${COLLADADOM_LIBRARY} ll::boost ll::libxml ll::minizip-ng)
diff --git a/indra/cmake/LibVLCPlugin.cmake b/indra/cmake/LibVLCPlugin.cmake
index 599ce02844..6361028c0c 100644
--- a/indra/cmake/LibVLCPlugin.cmake
+++ b/indra/cmake/LibVLCPlugin.cmake
@@ -9,20 +9,16 @@ use_prebuilt_binary(vlc-bin)
 set(LIBVLCPLUGIN ON CACHE BOOL
         "LIBVLCPLUGIN support for the llplugin/llmedia test apps.")
 
-if (WINDOWS)
-    target_link_libraries( ll::libvlc INTERFACE
-            libvlc.lib
-            libvlccore.lib
-    )
-elseif (DARWIN)
-    target_link_libraries( ll::libvlc INTERFACE
-            libvlc.dylib
-            libvlccore.dylib
-    )
-elseif (LINUX)
-    # Specify a full path to make sure we get a static link
-    target_link_libraries( ll::libvlc INTERFACE
-        ${LIBS_PREBUILT_DIR}/lib/libvlc.a
-        ${LIBS_PREBUILT_DIR}/lib/libvlccore.a
-    )
-endif (WINDOWS)
+find_library(VLC_LIBRARY
+    NAMES
+    libvlc.lib
+    libvlc.dylib
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+find_library(VLCCORE_LIBRARY
+    NAMES
+    libvlccore.lib
+    libvlccore.dylib
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+target_link_libraries(ll::libvlc INTERFACE ${VLC_LIBRARY} ${VLCCORE_LIBRARY})
diff --git a/indra/cmake/Meshoptimizer.cmake b/indra/cmake/Meshoptimizer.cmake
index fd144d2b97..af1c51f032 100644
--- a/indra/cmake/Meshoptimizer.cmake
+++ b/indra/cmake/Meshoptimizer.cmake
@@ -9,12 +9,12 @@ add_library( ll::meshoptimizer INTERFACE IMPORTED )
 use_system_binary(meshoptimizer)
 use_prebuilt_binary(meshoptimizer)
 
-if (WINDOWS)
-  target_link_libraries( ll::meshoptimizer INTERFACE meshoptimizer.lib)
-elseif (LINUX)
-  target_link_libraries( ll::meshoptimizer INTERFACE meshoptimizer.o)
-elseif (DARWIN)
-  target_link_libraries( ll::meshoptimizer INTERFACE libmeshoptimizer.a)
-endif (WINDOWS)
+find_library(MESHOPTIMIZER_LIBRARY
+    NAMES
+    meshoptimizer.lib
+    libmeshoptimizer.a
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
 
-target_include_directories( ll::meshoptimizer SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/meshoptimizer)
+target_link_libraries(ll::meshoptimizer INTERFACE ${MESHOPTIMIZER_LIBRARY})
+
+target_include_directories(ll::meshoptimizer SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/meshoptimizer)
diff --git a/indra/cmake/NDOF.cmake b/indra/cmake/NDOF.cmake
index b88fbccf2a..a8f63f945b 100644
--- a/indra/cmake/NDOF.cmake
+++ b/indra/cmake/NDOF.cmake
@@ -13,12 +13,15 @@ if (NDOF)
     use_prebuilt_binary(open-libndofdev)
   endif (WINDOWS OR DARWIN)
 
-  if (WINDOWS)
-    target_link_libraries( ll::ndof INTERFACE libndofdev)
-  elseif (DARWIN OR LINUX)
-    target_link_libraries( ll::ndof INTERFACE ndofdev)
-  endif (WINDOWS)
-  target_compile_definitions( ll::ndof INTERFACE LIB_NDOF=1)
+  find_library(NDOF_LIBRARY
+      NAMES
+      libndofdev
+      ndofdev
+      PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+  target_link_libraries(ll::ndof INTERFACE ${NDOF_LIBRARY})
+
+  target_compile_definitions(ll::ndof INTERFACE LIB_NDOF=1)
 endif (NDOF)
 
 
diff --git a/indra/cmake/NGHTTP2.cmake b/indra/cmake/NGHTTP2.cmake
index 7b2aa5971f..e81204d716 100644
--- a/indra/cmake/NGHTTP2.cmake
+++ b/indra/cmake/NGHTTP2.cmake
@@ -6,9 +6,12 @@ add_library( ll::nghttp2 INTERFACE IMPORTED )
 
 use_system_binary(nghttp2)
 use_prebuilt_binary(nghttp2)
-if (WINDOWS)
-  target_link_libraries( ll::nghttp2 INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/nghttp2.lib)
-else ()
-  target_link_libraries( ll::nghttp2 INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libnghttp2.a)
-endif ()
+
+find_library(NGHTTP2_LIBRARY
+    NAMES
+    nghttp2.lib
+    libnghttp2.a
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+target_link_libraries(ll::nghttp2 INTERFACE ${NGHTTP2_LIBRARY})
 target_include_directories( ll::nghttp2 SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/nghttp2)
diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake
index 0a7529c6c3..2566a08189 100644
--- a/indra/cmake/OPENAL.cmake
+++ b/indra/cmake/OPENAL.cmake
@@ -22,20 +22,17 @@ if (USE_OPENAL)
   target_compile_definitions( ll::openal INTERFACE LL_OPENAL=1)
   use_prebuilt_binary(openal)
 
-  if(WINDOWS)
-    target_link_libraries( ll::openal INTERFACE
-            OpenAL32
-            alut
-            )
-  elseif(LINUX)
-    target_link_libraries( ll::openal INTERFACE
-            openal
-            alut
-            )
-  else()
-    target_link_libraries( ll::openal INTERFACE
-            openal
-            alut
-            )
-  endif()
+  find_library(OPENAL_LIBRARY
+      NAMES
+      OpenAL32
+      openal
+      PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+  find_library(ALUT_LIBRARY
+      NAMES
+      alut
+      PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+  target_link_libraries(ll::openal INTERFACE ${OPENAL_LIBRARY} ${ALUT_LIBRARY})
+
 endif ()
diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake
index c4aab2e9e5..d31df57689 100644
--- a/indra/cmake/OpenJPEG.cmake
+++ b/indra/cmake/OpenJPEG.cmake
@@ -7,5 +7,11 @@ add_library( ll::openjpeg INTERFACE IMPORTED )
 use_system_binary(openjpeg)
 use_prebuilt_binary(openjpeg)
 
-target_link_libraries(ll::openjpeg INTERFACE openjp2 )
-target_include_directories( ll::openjpeg SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/openjpeg)
+find_library(OPENJPEG_LIBRARY
+    NAMES
+    openjp2
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+target_link_libraries(ll::openjpeg INTERFACE ${OPENJPEG_LIBRARY})
+
+target_include_directories(ll::openjpeg SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/openjpeg)
diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake
index 67a84e14af..9d33f2e0de 100644
--- a/indra/cmake/OpenSSL.cmake
+++ b/indra/cmake/OpenSSL.cmake
@@ -7,12 +7,24 @@ add_library( ll::openssl INTERFACE IMPORTED )
 
 use_system_binary(openssl)
 use_prebuilt_binary(openssl)
+
+find_library(SSL_LIBRARY
+    NAMES
+    libssl.lib
+    libssl.a
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+find_library(CRYPTO_LIBRARY
+    NAMES
+    libcrypto.lib
+    libcrypto.a
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+target_link_libraries(ll::openssl INTERFACE ${SSL_LIBRARY} ${CRYPTO_LIBRARY})
+
 if (WINDOWS)
-  target_link_libraries(ll::openssl INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libssl.lib ${ARCH_PREBUILT_DIRS_RELEASE}/libcrypto.lib Crypt32.lib)
-elseif (LINUX)
-  target_link_libraries(ll::openssl INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libssl.a ${ARCH_PREBUILT_DIRS_RELEASE}/libcrypto.a dl)
-else()
-  target_link_libraries(ll::openssl INTERFACE ssl crypto)
+  target_link_libraries(ll::openssl INTERFACE Crypt32.lib)
 endif (WINDOWS)
-target_include_directories( ll::openssl SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include)
+
+target_include_directories(ll::openssl SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include)
 
diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake
index e5893e9a20..0c01e5ee78 100644
--- a/indra/cmake/PNG.cmake
+++ b/indra/cmake/PNG.cmake
@@ -6,9 +6,12 @@ add_library( ll::libpng INTERFACE IMPORTED )
 
 use_system_binary(libpng)
 use_prebuilt_binary(libpng)
-if (WINDOWS)
-  target_link_libraries(ll::libpng INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libpng16.lib)
-else()
-  target_link_libraries(ll::libpng INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libpng16.a)
-endif()
-target_include_directories( ll::libpng SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/libpng16)
+
+find_library(LIBPNG_LIBRARY
+    NAMES
+    libpng16.lib
+    libpng16.a
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+target_link_libraries(ll::libpng INTERFACE ${LIBPNG_LIBRARY})
+target_include_directories(ll::libpng SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/libpng16)
diff --git a/indra/cmake/ZLIBNG.cmake b/indra/cmake/ZLIBNG.cmake
index d7b920da26..a6d67489e7 100644
--- a/indra/cmake/ZLIBNG.cmake
+++ b/indra/cmake/ZLIBNG.cmake
@@ -11,11 +11,14 @@ if(USE_CONAN )
 endif()
 
 use_prebuilt_binary(zlib-ng)
-if (WINDOWS)
-  target_link_libraries( ll::zlib-ng INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/zlib.lib )
-else()
-  target_link_libraries( ll::zlib-ng INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libz.a )
-endif (WINDOWS)
+
+find_library(ZLIBNG_LIBRARY
+    NAMES
+    zlib.lib
+    libz.a
+    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
+
+target_link_libraries(ll::zlib-ng INTERFACE ${ZLIBNG_LIBRARY})
 
 if( NOT LINUX )
   target_include_directories( ll::zlib-ng SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/zlib-ng)
diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp
index f4bcb97a5d..a5943fc0ef 100644
--- a/indra/llimagej2coj/llimagej2coj.cpp
+++ b/indra/llimagej2coj/llimagej2coj.cpp
@@ -29,8 +29,6 @@
 
 // this is defined so that we get static linking.
 #include "openjpeg.h"
-#include "event.h"
-#include "cio.h"
 
 #define MAX_ENCODED_DISCARD_LEVELS 5
 
@@ -50,6 +48,7 @@ std::string LLImageJ2COJ::getEngineInfo() const
 #endif
 }
 
+#if WANT_VERBOSE_OPJ_SPAM
 // Return string from message, eliminating final \n if present
 static std::string chomp(const char* msg)
 {
@@ -65,27 +64,34 @@ static std::string chomp(const char* msg)
 }
     return message;
 }
+#endif
 
 /**
 sample error callback expecting a LLFILE* client object
 */
 void error_callback(const char* msg, void*)
 {
-    LL_DEBUGS() << "LLImageJ2COJ: " << chomp(msg) << LL_ENDL;
+#if WANT_VERBOSE_OPJ_SPAM
+    LL_WARNS() << "LLImageJ2COJ: " << chomp(msg) << LL_ENDL;
+#endif
 }
 /**
 sample warning callback expecting a LLFILE* client object
 */
 void warning_callback(const char* msg, void*)
 {
-    LL_DEBUGS() << "LLImageJ2COJ: " << chomp(msg) << LL_ENDL;
+#if WANT_VERBOSE_OPJ_SPAM
+    LL_WARNS() << "LLImageJ2COJ: " << chomp(msg) << LL_ENDL;
+#endif
 }
 /**
 sample debug callback expecting no client object
 */
 void info_callback(const char* msg, void*)
 {
-    LL_DEBUGS() << "LLImageJ2COJ: " << chomp(msg) << LL_ENDL;
+#if WANT_VERBOSE_OPJ_SPAM
+    LL_INFOS() << "LLImageJ2COJ: " << chomp(msg) << LL_ENDL;
+#endif
 }
 
 // Divide a by 2 to the power of b and round upwards
@@ -97,39 +103,13 @@ int ceildivpow2(int a, int b)
 class JPEG2KBase
 {
 public:
-    JPEG2KBase() {}
+    JPEG2KBase() = default;
 
     U8*        buffer = nullptr;
     OPJ_SIZE_T size = 0;
     OPJ_OFF_T  offset = 0;
 };
 
-#define WANT_VERBOSE_OPJ_SPAM LL_DEBUG
-
-static void opj_info(const char* msg, void* user_data)
-{
-    llassert(user_data);
-#if WANT_VERBOSE_OPJ_SPAM
-    LL_INFOS("OpenJPEG") << msg << LL_ENDL;
-#endif
-}
-
-static void opj_warn(const char* msg, void* user_data)
-{
-    llassert(user_data);
-#if WANT_VERBOSE_OPJ_SPAM
-    LL_WARNS("OpenJPEG") << msg << LL_ENDL;
-#endif
-}
-
-static void opj_error(const char* msg, void* user_data)
-{
-    llassert(user_data);
-#if WANT_VERBOSE_OPJ_SPAM
-    LL_WARNS("OpenJPEG") << msg << LL_ENDL;
-#endif
-}
-
 static OPJ_SIZE_T opj_read(void * buffer, OPJ_SIZE_T bytes, void* user_data)
 {
     llassert(user_data);
@@ -222,11 +202,7 @@ public:
 
     JPEG2KDecode(S8 discardLevel)
     {
-        memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
         memset(&parameters, 0, sizeof(opj_dparameters_t));
-        event_mgr.error_handler = error_callback;
-        event_mgr.warning_handler = warning_callback;
-        event_mgr.info_handler = info_callback;
         opj_set_default_decoder_parameters(&parameters);
         parameters.cp_reduce = discardLevel;
     }
@@ -270,6 +246,11 @@ public:
 
         decoder = opj_create_decompress(OPJ_CODEC_J2K);
 
+        /* catch events using our callbacks and give a local context */
+        opj_set_error_handler(decoder, error_callback, nullptr);
+        opj_set_warning_handler(decoder, warning_callback, nullptr);
+        opj_set_info_handler(decoder, info_callback, nullptr);
+
         if (!opj_setup_decoder(decoder, &parameters))
         {
             return false;
@@ -340,9 +321,9 @@ public:
         decoder = opj_create_decompress(OPJ_CODEC_J2K);
         opj_setup_decoder(decoder, &parameters);
 
-        opj_set_info_handler(decoder, opj_info, this);
-        opj_set_warning_handler(decoder, opj_warn, this);
-        opj_set_error_handler(decoder, opj_error, this);
+        opj_set_info_handler(decoder, info_callback, this);
+        opj_set_warning_handler(decoder, warning_callback, this);
+        opj_set_error_handler(decoder, error_callback, this);
 
         if (stream)
         {
@@ -408,7 +389,6 @@ public:
 
 private:
     opj_dparameters_t         parameters;
-    opj_event_mgr_t           event_mgr;
     opj_image_t*              image = nullptr;
     opj_codec_t*              decoder = nullptr;
     opj_stream_t*             stream = nullptr;
@@ -423,10 +403,6 @@ public:
     JPEG2KEncode(const char* comment_text_in, bool reversible)
     {
         memset(&parameters, 0, sizeof(opj_cparameters_t));
-        memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
-        event_mgr.error_handler = error_callback;
-        event_mgr.warning_handler = warning_callback;
-        event_mgr.info_handler = info_callback;
 
         opj_set_default_encoder_parameters(&parameters);
         parameters.cod_format = OPJ_CODEC_J2K;
@@ -493,6 +469,11 @@ public:
 
         encoder = opj_create_compress(OPJ_CODEC_J2K);
 
+        /* catch events using our callbacks and give a local context */
+        opj_set_error_handler(encoder, error_callback, nullptr);
+        opj_set_warning_handler(encoder, warning_callback, nullptr);
+        opj_set_info_handler(encoder, info_callback, nullptr);
+
         parameters.tcp_mct = (image->numcomps >= 3) ? 1 : 0;
         parameters.cod_format = OPJ_CODEC_J2K;
         parameters.prog_order = OPJ_RLCP;
@@ -547,10 +528,6 @@ public:
             return false;
         }
 
-        opj_set_info_handler(encoder, opj_info, this);
-        opj_set_warning_handler(encoder, opj_warn, this);
-        opj_set_error_handler(encoder, opj_error, this);
-
         U32 tile_count = (rawImageIn.getWidth() >> 6) * (rawImageIn.getHeight() >> 6);
         U32 data_size_guess = tile_count * TILE_SIZE;
 
@@ -744,7 +721,6 @@ public:
 
 private:
     opj_cparameters_t   parameters;
-    opj_event_mgr_t     event_mgr;
     opj_image_t*        image = nullptr;
     opj_codec_t*        encoder = nullptr;
     opj_stream_t*       stream = nullptr;
diff --git a/indra/llwebrtc/CMakeLists.txt b/indra/llwebrtc/CMakeLists.txt
index a18b716003..4fde489942 100644
--- a/indra/llwebrtc/CMakeLists.txt
+++ b/indra/llwebrtc/CMakeLists.txt
@@ -10,10 +10,6 @@ include(WebRTC)
 
 project(llwebrtc)
 
-if (LINUX)
-    add_compile_options(-Wno-deprecated-declarations) # webrtc::CreateAudioDeviceWithDataObserver is deprecated
-endif (LINUX)
-
 set(llwebrtc_SOURCE_FILES
     llwebrtc.cpp
     )
@@ -65,6 +61,8 @@ target_include_directories( llwebrtc INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
 if (WINDOWS)
     set_property(TARGET llwebrtc PROPERTY
         MSVC_RUNTIME_LIBRARY "MultiThreadedDebug")
+else()
+    target_compile_options(llwebrtc PRIVATE -Wno-deprecated-declarations) # webrtc::CreateAudioDeviceWithDataObserver is deprecated
 endif (WINDOWS)
 
 ADD_CUSTOM_COMMAND(TARGET llwebrtc POST_BUILD
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index d2736c7c12..061738daae 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1965,12 +1965,12 @@ target_link_libraries(${VIEWER_BINARY_NAME}
         llcommon
         llmeshoptimizer
         llwebrtc
-        ll::ndof
         lllogin
         llprimitive
         llappearance
         ${LLPHYSICSEXTENSIONS_LIBRARIES}
         ll::bugsplat
+        ll::ndof
         ll::tracy
         ll::openxr
         )
@@ -2104,16 +2104,14 @@ if (DARWIN)
 
   # https://blog.kitware.com/upcoming-in-cmake-2-8-12-osx-rpath-support/
   set(CMAKE_MACOSX_RPATH 1)
-  
+
   set_target_properties(
     ${VIEWER_BINARY_NAME}
     PROPERTIES
     OUTPUT_NAME "${product}"
     # From Contents/MacOS/SecondLife, look in Contents/Frameworks
-    INSTALL_RPATH "@loader_path/../Frameworks"
-    # SIGH, as of 2018-05-24 (cmake 3.11.1) the INSTALL_RPATH property simply
-    # does not work. Try this:
-    LINK_FLAGS "-rpath @loader_path/../Frameworks"
+    BUILD_WITH_INSTALL_RPATH 1
+    INSTALL_RPATH "@executable_path/../Frameworks"
     MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info-SecondLife.plist"
     XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "${MACOSX_BUNDLE_GUI_IDENTIFIER}"
     )
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index f9aaeabbfb..b92c9f931b 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -859,7 +859,9 @@ class Darwin_x86_64_Manifest(ViewerManifest):
 
             # CEF framework goes inside Contents/Frameworks.
             # Remember where we parked this car.
-            with self.prefix(src="", dst="Frameworks"):
+            with self.prefix(src=relpkgdir, dst="Frameworks"):
+                self.path("libndofdev.dylib")
+
                 CEF_framework = "Chromium Embedded Framework.framework"
                 self.path2basename(relpkgdir, CEF_framework)
                 CEF_framework = self.dst_path_of(CEF_framework)
@@ -867,6 +869,22 @@ class Darwin_x86_64_Manifest(ViewerManifest):
                 if self.args.get('bugsplat'):
                     self.path2basename(relpkgdir, "BugsplatMac.framework")
 
+                # OpenAL dylibs
+                if self.args['openal'] == 'ON':
+                    for libfile in (
+                                "libopenal.dylib",
+                                "libalut.dylib",
+                                ):
+                        self.path(libfile)
+
+                # WebRTC libraries
+                with self.prefix(src=os.path.join(self.args['build'], os.pardir,
+                                          'sharedlibs', self.args['buildtype'], 'Resources')):
+                    for libfile in (
+                            'libllwebrtc.dylib',
+                    ):
+                        self.path(libfile)
+
             with self.prefix(dst="MacOS"):
                 executable = self.dst_path_of(self.channel())
                 if self.args.get('bugsplat'):
@@ -926,9 +944,6 @@ class Darwin_x86_64_Manifest(ViewerManifest):
                         self.path("*.png")
                         self.path("*.gif")
 
-                with self.prefix(src=relpkgdir, dst=""):
-                    self.path("libndofdev.dylib")
-
                 with self.prefix(src_dst="cursors_mac"):
                     self.path("*.tif")
 
@@ -988,20 +1003,6 @@ class Darwin_x86_64_Manifest(ViewerManifest):
                         print("Skipping %s" % dst)
                     return added
 
-                # WebRTC libraries
-                with self.prefix(src=os.path.join(self.args['build'], os.pardir,
-                                          'sharedlibs', self.args['buildtype'], 'Resources')):
-                    for libfile in (
-                            'libllwebrtc.dylib',
-                    ):
-                        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.
@@ -1019,14 +1020,6 @@ class Darwin_x86_64_Manifest(ViewerManifest):
                                 ):
                     self.path2basename(relpkgdir, libfile)
 
-                # OpenAL dylibs
-                if self.args['openal'] == 'ON':
-                    for libfile in (
-                                "libopenal.dylib",
-                                "libalut.dylib",
-                                ):
-                        dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile)
-
                 # our apps
                 executable_path = {}
                 embedded_apps = [ (os.path.join("llplugin", "slplugin"), "SLPlugin.app") ]