From 74ae12b38c1561adbd8b212fc62c0fad9a2f859a Mon Sep 17 00:00:00 2001
From: Adam Johnson <AdamJohnso@gmail.com>
Date: Sat, 20 Jul 2013 15:34:51 -0400
Subject: [PATCH] Grab the correct DX libs for our architecture

---
 cmake/FindDirectX.cmake | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/cmake/FindDirectX.cmake b/cmake/FindDirectX.cmake
index 2636c0c9..0cc4c361 100644
--- a/cmake/FindDirectX.cmake
+++ b/cmake/FindDirectX.cmake
@@ -9,46 +9,46 @@ if(DirectX_INCLUDE_DIR)
     set(DirectX_FIND_QUIETLY TRUE)
 endif()
 
+# Figure out the arch for the path suffixes
+if(CMAKE_SIZEOF_VOID_P MATCHES "8")
+    set(_dxarch "x64")
+else()
+    set(_dxarch "x86")
+endif()
+
 
 find_path(DirectX_INCLUDE_DIR d3dx9.h
-          $ENV{DXSDK_DIR}/Include
+          PATHS "$ENV{DXSDK_DIR}/Include"
 )
 
 find_library(DirectX_d3d9 NAMES d3d9
-             PATHS $ENV{DXSDK_DIR}/Lib/x86
-             PATHS $ENV{DXSDK_DIR}/Lib/x64
+             PATHS "$ENV{DXSDK_DIR}/Lib/${_dxarch}"
 )
 
 find_library(DirectX_d3dx9 NAMES d3dx9
-             PATHS $ENV{DXSDK_DIR}/Lib/x86
-             PATHS $ENV{DXSDK_DIR}/Lib/x64
+             PATHS "$ENV{DXSDK_DIR}/Lib/${_dxarch}"
 )
 
 find_library(DirectX_dinput8 NAMES dinput8
-             PATHS $ENV{DXSDK_DIR}/Lib/x86
-             PATHS $ENV{DXSDK_DIR}/Lib/x64
+             PATHS "$ENV{DXSDK_DIR}/Lib/${_dxarch}"
 )
 
 find_library(DirectX_dsound NAMES dsound
-             PATHS $ENV{DXSDK_DIR}/Lib/x86
-             PATHS $ENV{DXSDK_DIR}/Lib/x64
+             PATHS "$ENV{DXSDK_DIR}/Lib/${_dxarch}"
 )
 
 find_library(DirectX_dxguid NAMES dxguid
-             PATHS $ENV{DXSDK_DIR}/Lib/x86
-             PATHS $ENV{DXSDK_DIR}/Lib/x64
+             PATHS "$ENV{DXSDK_DIR}/Lib/${_dxarch}"
 )
 
 if (DirectX_OLD_SDK)
     find_library(DirectX_dxerr NAMES dxerr9
-                 PATHS $ENV{DXSDK_DIR}/Lib/x86
-                 PATHS $ENV{DXSDK_DIR}/Lib/x64
+                 PATHS "$ENV{DXSDK_DIR}/Lib/${_dxarch}"
     )
 else()
-find_library(DirectX_dxerr NAMES DxErr
-             PATHS $ENV{DXSDK_DIR}/Lib/x86
-             PATHS $ENV{DXSDK_DIR}/Lib/x64
-)
+    find_library(DirectX_dxerr NAMES DxErr
+                 PATHS "$ENV{DXSDK_DIR}/Lib/${_dxarch}"
+    )
 endif(DirectX_OLD_SDK)
 
 set(DirectX_LIBRARIES