From 85a01ea0626e92cb16aedd037eb430be3a1b9dc7 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 8 Dec 2017 12:12:57 +0100
Subject: [PATCH] FIRE-21917: Fix linking against wrong FmodEx library on
 Linux64, patch by Lord Drakeo

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

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 45f686fff0..2fcf1ca6f1 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -258,9 +258,18 @@ elseif(LINUX)
       set(release_files ${release_files} "libtcmalloc_minimal.so")
     endif (USE_TCMALLOC)
 
+    #if (FMODEX)
+    #  set(debug_files ${debug_files} "libfmodexL.so")
+    #  set(release_files ${release_files} "libfmodex.so")
+    #endif (FMODEX)
     if (FMODEX)
-      set(debug_files ${debug_files} "libfmodexL.so")
-      set(release_files ${release_files} "libfmodex.so")
+      if( NOT ND_BUILD64BIT_ARCH )
+        set(debug_files ${debug_files} "libfmodexL.so")
+        set(release_files ${release_files} "libfmodex.so")
+      else( NOT ND_BUILD64BIT_ARCH )
+        set(debug_files ${debug_files} "libfmodexL64.so")
+        set(release_files ${release_files} "libfmodex64.so")
+      endif( NOT ND_BUILD64BIT_ARCH )
     endif (FMODEX)
 
 else(WINDOWS)