diff options
author | Rye Mutt <rye@alchemyviewer.org> | 2024-08-12 00:30:42 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-08-12 07:30:42 +0300 |
commit | f982463488a35b58b86d5d76309055416eb9eaec (patch) | |
tree | da265e25ac896a9432346e6a07cf1de1341b163d /indra/cmake/Copy3rdPartyLibs.cmake | |
parent | af2b5a3c58999c12f7c5e091cd4703e358fe844c (diff) |
Update zlib-ng libxml2 libpng freetype minizip-ng boost collada-dom tinygltf packages (#2250)
Rebuild expat, apr, meshoptimizer, ogg_vorbis, libjpeg-turbo for symbol fixes
Diffstat (limited to 'indra/cmake/Copy3rdPartyLibs.cmake')
-rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 86c5b80fad..c6b89e1de3 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -54,7 +54,6 @@ if(WINDOWS) set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(release_files openjp2.dll - nghttp2.dll ) if(LLCOMMON_LINK_SHARED) @@ -62,15 +61,6 @@ if(WINDOWS) set(release_files ${release_files} libaprutil-1.dll) endif() - # OpenSSL - if(ADDRESS_SIZE EQUAL 64) - set(release_files ${release_files} libcrypto-1_1-x64.dll) - set(release_files ${release_files} libssl-1_1-x64.dll) - else(ADDRESS_SIZE EQUAL 64) - set(release_files ${release_files} libcrypto-1_1.dll) - set(release_files ${release_files} libssl-1_1.dll) - endif(ADDRESS_SIZE EQUAL 64) - # 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) @@ -183,8 +173,6 @@ elseif(DARWIN) set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(release_files libndofdev.dylib - libnghttp2.dylib - libnghttp2.14.dylib ) if(LLCOMMON_LINK_SHARED) @@ -226,8 +214,7 @@ elseif(LINUX) set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") # *FIX - figure out what to do with duplicate libalut.so here -brad set(release_files - ${EXPAT_COPY} - ) + ) if( USE_AUTOBUILD_3P ) list( APPEND release_files |