From 5f05b0db94d8ec6a5f96e57eb98bfc813f469ce6 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Tue, 15 Dec 2015 18:29:39 +0100
Subject: [PATCH] Merge with develop

---
 code/CMakeModules/FindWindowsSDK.cmake | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/code/CMakeModules/FindWindowsSDK.cmake b/code/CMakeModules/FindWindowsSDK.cmake
index 93540a7e8..7bb4a73d8 100644
--- a/code/CMakeModules/FindWindowsSDK.cmake
+++ b/code/CMakeModules/FindWindowsSDK.cmake
@@ -49,15 +49,15 @@ FOREACH(_VERSION ${WINSDK_VERSIONS})
   ENDIF()
 ENDFOREACH()
 
-SET(WINSDK_SUFFIX)
+SET(WINSDK_SUFFIXES)
 
 IF(TARGET_ARM)
   SET(WINSDK8_SUFFIX "arm")
 ELSEIF(TARGET_X64)
   SET(WINSDK8_SUFFIX "x64")
-  SET(WINSDK_SUFFIX "x64")
+  SET(WINSDK_SUFFIXES "x64" "amd64")
 ELSEIF(TARGET_X86)
-  SET(WINSDK8_SUFFIX "x86")
+  SET(WINSDK8_SUFFIXES "x86")
 ENDIF()
 
 SET(WINSDKCURRENT_VERSION_INCLUDE $ENV{INCLUDE})
@@ -306,12 +306,18 @@ FIND_PATH(WINSDK_OPENGL_INCLUDE_DIR GL.h
   ${WINSDK_DIR}/Include
 )
 
+SET(WINSDK_LIBRARY_DIRS
+  ${WINSDK_DIR}/Lib/winv6.3/um/${WINSDK8_SUFFIX}
+  ${WINSDK_DIR}/Lib/win8/um/${WINSDK8_SUFFIX})
+
+FOREACH(_SUFFIX ${WINSDK_SUFFIXES})
+  SET(WINSDK_LIBRARY_DIRS ${WINSDK_LIBRARY_DIRS} ${WINSDK_DIR}/Lib/${_SUFFIX})
+ENDFOREACH()
+
 # directory where all libraries are found
 FIND_PATH(WINSDK_LIBRARY_DIR ComCtl32.lib
   HINTS
-  ${WINSDK_DIR}/Lib/winv6.3/um/${WINSDK8_SUFFIX}
-  ${WINSDK_DIR}/Lib/win8/um/${WINSDK8_SUFFIX}
-  ${WINSDK_DIR}/Lib/${WINSDK_SUFFIX}
+  ${WINSDK_LIBRARY_DIRS}
 )
 
 # signtool is used to sign executables