diff options
| author | Mark Palange <palange@lindenlab.com> | 2009-05-19 23:41:59 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2009-05-19 23:41:59 +0000 |
| commit | 8c5ca38f1d48edace2a67df00dc319381dc313af (patch) | |
| tree | 5838b815167730697700483ae2f572724b18803f /indra/cmake | |
| parent | d43bd2cfdd1ef9e1e7c6d187b09eb2ef07ec4122 (diff) | |
Fix to develop.py to build on 64 bit windows.
Added March 2009 DirectX SDK to cmake config.
Reviewed by brad
Diffstat (limited to 'indra/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 d406f3785b..29724ee2fc 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 (March 2009)/Include" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Include" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Include" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2008)/Include" @@ -23,6 +24,7 @@ if (VIEWER AND WINDOWS) find_path(DIRECTX_LIBRARY_DIR dxguid.lib "$ENV{DXSDK_DIR}/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" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2008)/Lib/x86" |