From d01d30ad5e4fb430b0d36fb3eaa3b7f13aa8f65d Mon Sep 17 00:00:00 2001
From: septag <sep.tagh@gmail.com>
Date: Sun, 30 Oct 2016 14:18:45 +0330
Subject: Added cmake support for dsound and windows 8/10 SDKs

---
 cmake/FindDSound.cmake | 60 +++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 52 insertions(+), 8 deletions(-)

(limited to 'cmake/FindDSound.cmake')

diff --git a/cmake/FindDSound.cmake b/cmake/FindDSound.cmake
index 0ddf98aa..3fd26ed6 100644
--- a/cmake/FindDSound.cmake
+++ b/cmake/FindDSound.cmake
@@ -8,19 +8,63 @@
 #   DSOUND_LIBRARY     - the dsound library
 #
 
+# DSOUND_INCLUDE_DIR
+file(GLOB DXSDK_INCLUDE_DIRS LIST_DIRECTORIES TRUE "C:/Program Files (x86)/Windows Kits/10/Include/*")
+if (DXSDK_INCLUDE_DIRS)
+  list(SORT DXSDK_INCLUDE_DIRS)
+  list(REVERSE DXSDK_INCLUDE_DIRS)
+endif() 
+
 find_path(DSOUND_INCLUDE_DIR
-          NAMES dsound.h
-          PATHS "${DXSDK_DIR}"
-          PATH_SUFFIXES include
-          DOC "The DirectSound include directory"
+          NAMES 
+            "dsound.h" 
+          PATHS 
+            "${DXSDK_DIR}"
+            ${DXSDK_INCLUDE_DIRS}
+            "C:/Program Files (x86)/Windows Kits/8.0"
+            "C:/Program Files (x86)/Windows Kits/8.1"
+          PATH_SUFFIXES 
+            Include
+            um 
+            Include/um
+          DOC 
+            "The DirectSound include directory"
 )
 
+# DSOUND_LIBRARY
+if(CMAKE_CL_64)
+    set (DirectX_ARCHITECTURE x64)
+else()
+    set (DirectX_ARCHITECTURE x86)
+endif()
+
+file(GLOB DXSDK_LIB_DIRS LIST_DIRECTORIES TRUE "C:/Program Files (x86)/Windows Kits/10/Lib/*")
+if (DXSDK_LIB_DIRS)
+  list(SORT DXSDK_LIB_DIRS)
+  list(REVERSE DXSDK_LIB_DIRS)
+endif() 
+
 find_library(DSOUND_LIBRARY
              NAMES dsound
-             PATHS "${DXSDK_DIR}"
-             PATH_SUFFIXES lib lib/x86 lib/x64
-             DOC "The DirectSound library"
-)
+             DOC "The DirectSound library")
+if (NOT DSOUND_LIBRARY)
+  find_library(DSOUND_LIBRARY
+               NAMES dsound
+               PATHS 
+                "${DXSDK_DIR}"
+                ${DXSDK_LIB_DIRS}
+                "C:/Program Files (x86)/Windows Kits/8.0"
+                "C:/Program Files (x86)/Windows Kits/8.1"               
+               PATH_SUFFIXES 
+                Lib 
+                Lib/${DirectX_ARCHITECTURE}
+                um/${DirectX_ARCHITECTURE}
+                Lib/win8/um/${DirectX_ARCHITECTURE}
+                Lib/winv6.3/um/${DirectX_ARCHITECTURE}
+               DOC 
+                "The DirectSound library"
+  )
+endif()
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(DSound
-- 
cgit v1.2.3