diff --git a/code/CMakeModules/FindDirectXSDK.cmake b/code/CMakeModules/FindDirectXSDK.cmake
index d2e0a1ece..274993d8b 100644
--- a/code/CMakeModules/FindDirectXSDK.cmake
+++ b/code/CMakeModules/FindDirectXSDK.cmake
@@ -5,57 +5,61 @@
 #  DXSDK_LIBRARIES   - List of libraries when using 3DSMAX.
 #  DXSDK_FOUND       - True if MAX SDK found.
 
-if(DXSDK_INCLUDE_DIR)
+IF(DXSDK_DIR)
     # Already in cache, be silent
-    set(DXSDK_FIND_QUIETLY TRUE)
-endif(DXSDK_INCLUDE_DIR)
+    SET(DXSDK_FIND_QUIETLY TRUE)
+ENDIF(DXSDK_DIR)
 
-find_path(DXSDK_INCLUDE_DIR dxsdkver.h 
+FIND_PATH(DXSDK_DIR
+  "Include/dxsdkver.h"
   PATHS
-  "$ENV{DXSDK_DIR}" 
-  "$ENV{DXSDK_DIR}/Include"
+  "$ENV{DXSDK_DIR}"
 )
 
 MACRO(FIND_DXSDK_LIBRARY MYLIBRARY MYLIBRARYNAME)        
   FIND_LIBRARY(${MYLIBRARY}
                NAMES ${MYLIBRARYNAME}
-               PATHS 
+               PATHS
+			   "${DXSDK_LIBRARY_DIR}"
                "$ENV{DXSDK_DIR}"
                "$ENV{DXSDK_DIR}/Lib"
                "$ENV{DXSDK_DIR}/Lib/x86"
                )               
 ENDMACRO(FIND_DXSDK_LIBRARY MYLIBRARY MYLIBRARYNAME)
 
-FIND_DXSDK_LIBRARY(DXSDK_GUID_LIBRARY dxguid)
-FIND_DXSDK_LIBRARY(DXSDK_DINPUT_LIBRARY dinput8)
-FIND_DXSDK_LIBRARY(DXSDK_DSOUND_LIBRARY dsound)
-FIND_DXSDK_LIBRARY(DXSDK_XAUDIO_LIBRARY x3daudio)
-FIND_DXSDK_LIBRARY(DXSDK_D3DX9_LIBRARY d3dx9)
-FIND_DXSDK_LIBRARY(DXSDK_D3D9_LIBRARY d3d9)
+IF(DXSDK_DIR)
+  SET(DXSDK_INCLUDE_DIR "${DXSDK_DIR}/Include")
 
-#FIND_DXSDK_LIBRARY(DXSDK_MESH_LIBRARY mesh)
-#FIND_DXSDK_LIBRARY(DXSDK_MAXUTIL_LIBRARY maxutil)
-#FIND_DXSDK_LIBRARY(DXSDK_MAXSCRIPT_LIBRARY maxscrpt)
-#FIND_DXSDK_LIBRARY(DXSDK_PARAMBLK2_LIBRARY paramblk2)
-#FIND_DXSDK_LIBRARY(DXSDK_BMM_LIBRARY bmm)
+  IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    SET(DXSDK_LIBRARY_DIR "${DXSDK_DIR}/Lib/x64")
+  ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    SET(DXSDK_LIBRARY_DIR "${DXSDK_DIR}/Lib/x86")
+  ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)
+
+  FIND_DXSDK_LIBRARY(DXSDK_GUID_LIBRARY dxguid)
+  FIND_DXSDK_LIBRARY(DXSDK_DINPUT_LIBRARY dinput8)
+  FIND_DXSDK_LIBRARY(DXSDK_DSOUND_LIBRARY dsound)
+  FIND_DXSDK_LIBRARY(DXSDK_XAUDIO_LIBRARY x3daudio)
+  FIND_DXSDK_LIBRARY(DXSDK_D3DX9_LIBRARY d3dx9)
+  FIND_DXSDK_LIBRARY(DXSDK_D3D9_LIBRARY d3d9)
+
+  #FIND_DXSDK_LIBRARY(DXSDK_MESH_LIBRARY mesh)
+  #FIND_DXSDK_LIBRARY(DXSDK_MAXUTIL_LIBRARY maxutil)
+  #FIND_DXSDK_LIBRARY(DXSDK_MAXSCRIPT_LIBRARY maxscrpt)
+  #FIND_DXSDK_LIBRARY(DXSDK_PARAMBLK2_LIBRARY paramblk2)
+  #FIND_DXSDK_LIBRARY(DXSDK_BMM_LIBRARY bmm)
+ENDIF(DXSDK_DIR)
 
 # Handle the QUIETLY and REQUIRED arguments and set DXSDK_FOUND to TRUE if
 # all listed variables are TRUE.
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(DirectXSDK DEFAULT_MSG
-    DXSDK_INCLUDE_DIR DXSDK_GUID_LIBRARY)
-
-if(DirectXSDK_FOUND)
-message(status " directx found.")
-    SET(DXSDK_LIBRARIES
-      ${DXSDK_GUID_LIBRARY}
-      ${DXSDK_DINPUT_LIBRARY}
-      ${DXSDK_DSOUND_LIBRARY}
-      ${DXSDK_D3DX9_LIBRARY}
-      ${DXSDK_D3D9_LIBRARY})
-
-else(DirectXSDK_FOUND)
-    set(DXSDK_LIBRARIES)
-endif(DirectXSDK_FOUND)
-
-mark_as_advanced(DXSDK_INCLUDE_DIR DXSDK_LIBRARIES)
+INCLUDE(FindPackageHandleStandardArgs)
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(DIRECTXSDK DEFAULT_MSG DXSDK_DIR DXSDK_GUID_LIBRARY DXSDK_DINPUT_LIBRARY)
+
+MARK_AS_ADVANCED(DXSDK_INCLUDE_DIR
+  DXSDK_GUID_LIBRARY
+  DXSDK_DINPUT_LIBRARY
+  DXSDK_DSOUND_LIBRARY
+  DXSDK_XAUDIO_LIBRARY
+  DXSDK_D3DX9_LIBRARY
+  DXSDK_D3D9_LIBRARY)