diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-05-24 16:07:29 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-05-24 16:07:29 -0400 |
| commit | 0ebdfaa5fc72a6b3a65d4acd75697b77cc8738d7 (patch) | |
| tree | 933444e64669ba2e532fb8da7ab257206b53aaca /indra/cmake/Copy3rdPartyLibs.cmake | |
| parent | ec8ee339396aedb4032ae123843ae630546cd588 (diff) | |
| parent | b247c4e42434715459df93b5cbf6adb15d3c4cc4 (diff) | |
Automated merge with ssh://bitbucket.org/nat_linden/maint-maint-8675
Diffstat (limited to 'indra/cmake/Copy3rdPartyLibs.cmake')
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 09a97fc03e..7f708bc27a 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -49,6 +49,18 @@ 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(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) + if (FMODEX) if(ADDRESS_SIZE EQUAL 32) |