diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-01-18 10:15:15 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-01-18 10:15:15 -0500 |
| commit | 96d28ad5a797286208b664b3b2ca95046e71263b (patch) | |
| tree | 506eea90380f1cafb5c39dbb7fbdf2852a05878c /indra | |
| parent | 5bfc1e7ed764f4d63b02a2f0c4081c55acae9cdb (diff) | |
more places where vivox names must be conditional on address size
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 77c588704c..dea36323f0 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -20,9 +20,18 @@ if(WINDOWS) set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(vivox_files SLVoice.exe - vivoxsdk.dll - ortp.dll ) + if (ADDRESS_SIZE EQUAL 64) + list(APPEND vivox_files + vivoxsdk_64.dll + ortp_64.dll + ) + else (ADDRESS_SIZE EQUAL 64) + list(APPEND vivox_files + vivoxsdk.dll + ortp.dll + ) + endif (ADDRESS_SIZE EQUAL 64) #******************************* # Misc shared libs |