diff options
| author | Chris Robinson <[email protected]> | 2014-08-15 14:26:06 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2014-08-15 14:26:06 -0700 |
| commit | dd1df64537b11becd910e4c84f0e8e41cc6e51da (patch) | |
| tree | df8ca8115d448aa9d3def2146f8b0d4075f5f64c | |
| parent | d60ce358462d5418a85effccfc83f26570024834 (diff) | |
Search for the correct include and lib directories for the DX SDK
And only set them when needed.
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | cmake/FindDSound.cmake | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0087edb2..ca67eb75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -230,9 +230,6 @@ IF(MSVC) ENDIF() IF(DXSDK_DIR) MESSAGE(STATUS "Using DirectX SDK directory: ${DXSDK_DIR}") - SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} "${DXSDK_DIR}/Include") - INCLUDE_DIRECTORIES("${DXSDK_DIR}/Include") - LINK_DIRECTORIES("${DXSDK_DIR}/Lib") ENDIF() OPTION(FORCE_STATIC_VCRT "Force /MT for static VC runtimes" OFF) diff --git a/cmake/FindDSound.cmake b/cmake/FindDSound.cmake index 36cdf4b5..0ddf98aa 100644 --- a/cmake/FindDSound.cmake +++ b/cmake/FindDSound.cmake @@ -9,14 +9,16 @@ # find_path(DSOUND_INCLUDE_DIR - PATHS "${DXSDK_DIR}/include" NAMES dsound.h + PATHS "${DXSDK_DIR}" + PATH_SUFFIXES include DOC "The DirectSound include directory" ) find_library(DSOUND_LIBRARY - PATHS "${DXSDK_DIR}/lib" NAMES dsound + PATHS "${DXSDK_DIR}" + PATH_SUFFIXES lib lib/x86 lib/x64 DOC "The DirectSound library" ) |