diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-01 09:52:37 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-01 09:52:37 -0400 |
| commit | d0ba2bc847b5addf16cf90cea34de5194cd61511 (patch) | |
| tree | a7f80f0c8bb60f497fee8b49b75faa40e0b0ab52 /indra/cmake/DirectX.cmake | |
| parent | e23eeb7ed20055e1a95ea87e0014ba141f4ab0bb (diff) | |
| parent | 5e617d77f34f17f7a8f3677270f2738f857a60b8 (diff) | |
pull 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" |