From 5a88951837f65a9662fa2f7f3a0c95e6d1dee9e8 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Fri, 11 Apr 2014 17:56:26 +0200
Subject: [PATCH] Changed: Find DirectX libraries in alternative folders

--HG--
branch : compatibility
---
 code/CMakeModules/FindDirectXSDK.cmake | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/code/CMakeModules/FindDirectXSDK.cmake b/code/CMakeModules/FindDirectXSDK.cmake
index dc6753a8b..3cf91ec3c 100644
--- a/code/CMakeModules/FindDirectXSDK.cmake
+++ b/code/CMakeModules/FindDirectXSDK.cmake
@@ -27,7 +27,7 @@ FIND_PATH(DXSDK_DIR
 MACRO(FIND_DXSDK_LIBRARY MYLIBRARY MYLIBRARYNAME)        
   FIND_LIBRARY(${MYLIBRARY}
     NAMES ${MYLIBRARYNAME}
-    PATHS
+    HINTS
     "${DXSDK_LIBRARY_DIR}"
     )
 ENDMACRO(FIND_DXSDK_LIBRARY MYLIBRARY MYLIBRARYNAME)
@@ -36,11 +36,16 @@ IF(DXSDK_DIR)
   SET(DXSDK_INCLUDE_DIR "${DXSDK_DIR}/Include")
 
   IF(TARGET_X64)
-    SET(DXSDK_LIBRARY_DIR "${DXSDK_DIR}/Lib/x64")
+    SET(DXSDK_LIBRARY_DIRS ${DXSDK_DIR}/Lib/x64 ${DXSDK_DIR}/lib/amd64)
   ELSE(TARGET_X64)
-    SET(DXSDK_LIBRARY_DIR "${DXSDK_DIR}/Lib/x86")
+    SET(DXSDK_LIBRARY_DIRS ${DXSDK_DIR}/Lib/x86 ${DXSDK_DIR}/lib)
   ENDIF(TARGET_X64)
 
+  FIND_PATH(DXSDK_LIBRARY_DIR
+    dxguid.lib
+    PATHS
+    ${DXSDK_LIBRARY_DIRS})
+
   FIND_DXSDK_LIBRARY(DXSDK_GUID_LIBRARY dxguid)
   FIND_DXSDK_LIBRARY(DXSDK_DINPUT_LIBRARY dinput8)
   FIND_DXSDK_LIBRARY(DXSDK_DSOUND_LIBRARY dsound)