diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-20 07:36:16 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-20 07:36:16 -0400 |
| commit | 1e34cd77f7858f0a79d82d405be76837aa2af04e (patch) | |
| tree | 40530bc9ab88fca0fcee1c4bce02d2020a1a6b1e /indra/cmake/DirectX.cmake | |
| parent | f122d0939060fd597820a71d85a5c0d839bcff5d (diff) | |
| parent | 6d3cf2bba29d3134b4ec151df3a8ca92e3506c6b (diff) | |
pull STORM-1089 beta fixes to autobuild2010 branch
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" |