diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-03 21:18:15 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-03 21:18:15 -0500 |
| commit | c20eb01ff2adfc23b83d1d5c8723962f794fdbf4 (patch) | |
| tree | eec524d10d41ec5184a34e78df5aab6180db75c4 /indra/cmake/DirectX.cmake | |
| parent | a8b9392fd83c9fcd2261e76a135d451ae5b90e9b (diff) | |
| parent | 856a6992ebb0989e5d143d987a3e9ba79bb6492e (diff) | |
pull up changes from viewer-autobuild
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" |