diff options
| author | Alain Linden <alain@lindenlab.com> | 2011-01-31 12:54:57 -0800 |
|---|---|---|
| committer | Alain Linden <alain@lindenlab.com> | 2011-01-31 12:54:57 -0800 |
| commit | d9a0a04af4d48d8f1e8ef6e70d3d0863689071bd (patch) | |
| tree | daeddfca7498fa6bafdf8c776093690d2299a86e | |
| parent | f05f2412b2d193b4c767fd30e1e1ef1a3dd404c8 (diff) | |
find latest DirectX dirs.
| -rw-r--r-- | indra/cmake/DirectX.cmake | 2 | ||||
| -rw-r--r-- | indra/llwindow/CMakeLists.txt | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/indra/cmake/DirectX.cmake b/indra/cmake/DirectX.cmake index 29724ee2fc..b2a18805d4 100644 --- a/indra/cmake/DirectX.cmake +++ b/indra/cmake/DirectX.cmake @@ -3,6 +3,7 @@ if (VIEWER AND WINDOWS) find_path(DIRECTX_INCLUDE_DIR dxdiag.h "$ENV{DXSDK_DIR}/Include" + "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2009)/Include" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2009)/Include" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Include" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Include" @@ -24,6 +25,7 @@ if (VIEWER AND WINDOWS) find_path(DIRECTX_LIBRARY_DIR dxguid.lib "$ENV{DXSDK_DIR}/Lib/x86" + "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2009)/Lib/x86" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2009)/Lib/x86" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Lib/x86" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Lib/x86" diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt index 4d2677fd91..9d174ef1cd 100644 --- a/indra/llwindow/CMakeLists.txt +++ b/indra/llwindow/CMakeLists.txt @@ -30,6 +30,7 @@ include_directories( ${LLVFS_INCLUDE_DIRS} ${LLWINDOW_INCLUDE_DIRS} ${LLXML_INCLUDE_DIRS} + ${DIRECTX_INCLUDE_DIR} ) set(llwindow_SOURCE_FILES |