From 246315c723fa068f2f68af19f09057b283bc1cbc Mon Sep 17 00:00:00 2001
From: Drake Arconis <lightdrake@gmail.com>
Date: Thu, 27 Dec 2012 15:15:27 -0500
Subject: [PATCH] This is the Cupcake Commit. Cupcakes. Also may fix linux
 fmodex64.

---
 indra/cmake/FMODEX.cmake | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/indra/cmake/FMODEX.cmake b/indra/cmake/FMODEX.cmake
index 0a4bc0647..902af05fb 100644
--- a/indra/cmake/FMODEX.cmake
+++ b/indra/cmake/FMODEX.cmake
@@ -17,15 +17,25 @@ find_library(FMODEX_LIBRARY
 if (NOT FMODEX_LIBRARY)
   set(FMODEX_SDK_DIR CACHE PATH "Path to the FMOD Ex SDK.")
   if (FMODEX_SDK_DIR)
-    find_library(FMODEX_LIBRARY
-                 fmodex_vc fmodexL_vc fmodex fmodexL fmodex64 fmodexL64
-                 PATHS
-                 ${FMODEX_SDK_DIR}/api/lib
-                 ${FMODEX_SDK_DIR}/api
-                 ${FMODEX_SDK_DIR}/lib
-                 ${FMODEX_SDK_DIR}
-                 )
-
+    if(WORD_SIZE EQUAL 32)
+      find_library(FMODEX_LIBRARY
+                   fmodex_vc fmodexL_vc fmodex fmodexL
+                   PATHS
+                   ${FMODEX_SDK_DIR}/api/lib
+                   ${FMODEX_SDK_DIR}/api
+                   ${FMODEX_SDK_DIR}/lib
+                   ${FMODEX_SDK_DIR}
+                   )
+    elseif(WORD_SIZE EQUAL 64)
+      find_library(FMODEX_LIBRARY
+                   fmodex64 fmodexL64
+                   PATHS
+                   ${FMODEX_SDK_DIR}/api/lib
+                   ${FMODEX_SDK_DIR}/api
+                   ${FMODEX_SDK_DIR}/lib
+                   ${FMODEX_SDK_DIR}
+                   )
+    endif(WORD_SIZE EQUAL 32)
   endif(FMODEX_SDK_DIR)
   if(WINDOWS AND NOT FMODEX_LIBRARY)
     set(FMODEX_PROG_DIR "$ENV{PROGRAMFILES}/FMOD SoundSystem/FMOD Programmers API Windows")