diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-27 06:39:42 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-27 06:39:42 -0400 |
| commit | 5b316df2249fc62c1e6a4f089b9726c4e62f23e0 (patch) | |
| tree | 550521651fb4a14124f9c6aed3c9018b29d92920 /indra/cmake/DirectX.cmake | |
| parent | b7b9a37bc13d40a3caf7ea77d6857c2bb6036e06 (diff) | |
| parent | 3df0b60b3ad338a62a27e1492990f15c1393ea03 (diff) | |
merge out latest changes from viewer-development
Diffstat (limited to 'indra/cmake/DirectX.cmake')
| -rw-r--r-- | indra/cmake/DirectX.cmake | 2 |
1 files changed, 2 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" |