diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-09-26 16:39:16 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-09-26 16:39:16 -0400 |
| commit | 1e8851c4dfc40fe7dc39b7b3cfae5af97f709290 (patch) | |
| tree | cabe478fbe5fb3b2fce720820a43801df3c25c4c /indra/cmake/Copy3rdPartyLibs.cmake | |
| parent | 58aef8beaf79dc83546a7b080014ca5030733ac8 (diff) | |
| parent | 9fd463bd9496ba5d97abec6ee75b9c0c089aa69d (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/cmake/Copy3rdPartyLibs.cmake')
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 09a97fc03e..dde53835fb 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -49,6 +49,20 @@ if(WINDOWS) libhunspell.dll ) + # Filenames are different for 32/64 bit BugSplat file and we don't + # have any control over them so need to branch. + if (BUGSPLAT_DB) + if(ADDRESS_SIZE EQUAL 32) + set(release_files ${release_files} BugSplat.dll) + set(release_files ${release_files} BugSplatRc.dll) + set(release_files ${release_files} BsSndRpt.exe) + else(ADDRESS_SIZE EQUAL 32) + set(release_files ${release_files} BugSplat64.dll) + set(release_files ${release_files} BugSplatRc64.dll) + set(release_files ${release_files} BsSndRpt64.exe) + endif(ADDRESS_SIZE EQUAL 32) + endif (BUGSPLAT_DB) + if (FMODEX) if(ADDRESS_SIZE EQUAL 32) |