diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-08-21 19:15:16 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-08-21 19:15:16 -0400 |
| commit | 6a6114568687a67dc1e2de4fd1e8a3bed605c94d (patch) | |
| tree | 9d78619f4187ac9c42b8c8772c250e85fe84be85 /indra/cmake/Copy3rdPartyLibs.cmake | |
| parent | 6f54add8a8852c8f3df86abebe38ef0ce4a6742c (diff) | |
| parent | 7b83e8cdf742f800e0e7e59a9aae0ce870a6cc9b (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..c9519b0e1d 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 (DEFINED ENV{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 (DEFINED ENV{BUGSPLAT_DB}) + if (FMODEX) if(ADDRESS_SIZE EQUAL 32) |