diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-12-07 18:23:35 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-12-07 18:23:35 -0500 |
| commit | 97e83f7dfb818023c55ed539aa198f28c39c5458 (patch) | |
| tree | e082dcfbd0e26a5495f26e7177094c7053d5d77f /indra/cmake | |
| parent | 54f1f81d5ae651aef932afd81c09ede9c191b2cc (diff) | |
| parent | 70a42af076cbe6f12a265d508b4ed96af65d26ba (diff) | |
merge changes for callums updates
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 5b59666796..4630246d06 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -30,17 +30,6 @@ if(WINDOWS) #******************************* # Misc shared libs -# set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}") -# set(debug_files -# libapr-1.dll -# libaprutil-1.dll -# libapriconv-1.dll -# ssleay32.dll -# libeay32.dll -# glod.dll -# libhunspell.dll -# ) - set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(release_files openjpeg.dll @@ -54,8 +43,12 @@ if(WINDOWS) ) if (FMODEX) -# set(debug_files ${debug_files} fmodexL.dll) - set(release_files ${release_files} fmodex.dll) + + if(ADDRESS_SIZE EQUAL 32) + set(release_files ${release_files} fmodex.dll) + else(ADDRESS_SIZE EQUAL 32) + set(release_files ${release_files} fmodex64.dll) + endif(ADDRESS_SIZE EQUAL 32) endif (FMODEX) #******************************* |