diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-19 06:32:13 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-19 06:32:13 -0400 |
commit | 5a1b27ba5fbaaa9ee5528b1023a294bc899f7768 (patch) | |
tree | c641bd45e6384c85bff5e43ab01af5cad784283b /indra/cmake/DirectX.cmake | |
parent | 1a7369408c0b2cd15dbdc79d045f3347a8ab47d1 (diff) | |
parent | 9693227cb41f909ef66f86e6699ad0bf124a7e83 (diff) |
merge out latest 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" |