From 004cd151ff068d348a24127dbeb33696d00d2748 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@gmail.com>
Date: Mon, 5 Dec 2016 12:24:00 -0800
Subject: update copying of fmodex{64}.dll to right place for 32/64 bit builds

---
 indra/cmake/Copy3rdPartyLibs.cmake | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

(limited to 'indra/cmake')

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)
 
     #*******************************
-- 
cgit v1.2.3