diff options
| author | Callum Prentice <callum@lindenlab.com> | 2021-10-13 14:47:06 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2021-10-13 14:47:06 -0700 |
| commit | 8a1bc1b9e299077a77bc8498555667adcb387655 (patch) | |
| tree | 4b5a8b329148e5bd86bec785edda6a6f79016d37 /indra/cmake/Copy3rdPartyLibs.cmake | |
| parent | c50db007dfdeecae5c3451fbb188584588c23c47 (diff) | |
| parent | cbaba2df56c66926e051d50b6cb02955c81c2a6c (diff) | |
Merge with head of Master after a new Viewer release
Diffstat (limited to 'indra/cmake/Copy3rdPartyLibs.cmake')
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 46ddb9d15b..b20d23cead 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -56,14 +56,21 @@ if(WINDOWS) libapr-1.dll libaprutil-1.dll libapriconv-1.dll - ssleay32.dll - libeay32.dll nghttp2.dll glod.dll libhunspell.dll uriparser.dll ) + # 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) @@ -158,7 +165,6 @@ elseif(DARWIN) libapr-1.dylib libaprutil-1.0.dylib libaprutil-1.dylib - libexception_handler.dylib ${EXPAT_COPY} libGLOD.dylib libhunspell-1.3.0.dylib |