diff options
| author | Callum Prentice <callum@gmail.com> | 2016-12-05 12:24:00 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2016-12-05 12:24:00 -0800 |
| commit | 004cd151ff068d348a24127dbeb33696d00d2748 (patch) | |
| tree | 10db4bc4e645cb26a6ae973207fa391ace1841b2 /indra/cmake | |
| parent | 011d07f1e3f0cc369993747b50672e82a14fd07c (diff) | |
update copying of fmodex{64}.dll to right place for 32/64 bit builds
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) #******************************* |