diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-11-14 16:17:36 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-11-14 16:17:36 -0500 |
| commit | f7e99f0db7f9fb52f8001e536f95ec898740631e (patch) | |
| tree | 4f6048435c619a14dd0108bb835068098776874d /indra/cmake/Copy3rdPartyLibs.cmake | |
| parent | 8558ce5c600b810356010ba3cd6d534ef22f4081 (diff) | |
| parent | 4e776c522cb4ba49a5b833d4b9164ab8c48f4b9b (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) |