diff options
| author | McCabe Maxsted | 2011-04-26 21:49:25 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2011-04-26 21:49:25 -0700 |
| commit | 12144a468deb5e10ebed6b7f75e406a2d9126e56 (patch) | |
| tree | 08d08afbcad71aa474a882c057d8e439f659e583 /linden/indra | |
| parent | Updated windows installer version (diff) | |
| download | meta-impy-12144a468deb5e10ebed6b7f75e406a2d9126e56.zip meta-impy-12144a468deb5e10ebed6b7f75e406a2d9126e56.tar.gz meta-impy-12144a468deb5e10ebed6b7f75e406a2d9126e56.tar.bz2 meta-impy-12144a468deb5e10ebed6b7f75e406a2d9126e56.tar.xz | |
Added DirectX SDKs june 2010 and march 2009 to cmake
Diffstat (limited to 'linden/indra')
| -rw-r--r-- | linden/indra/cmake/DirectX.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/cmake/DirectX.cmake b/linden/indra/cmake/DirectX.cmake index d406f37..e455755 100644 --- a/linden/indra/cmake/DirectX.cmake +++ b/linden/indra/cmake/DirectX.cmake | |||
| @@ -3,6 +3,8 @@ | |||
| 3 | if (VIEWER AND WINDOWS) | 3 | if (VIEWER AND WINDOWS) |
| 4 | find_path(DIRECTX_INCLUDE_DIR dxdiag.h | 4 | find_path(DIRECTX_INCLUDE_DIR dxdiag.h |
| 5 | "$ENV{DXSDK_DIR}/Include" | 5 | "$ENV{DXSDK_DIR}/Include" |
| 6 | "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2010)/Include" | ||
| 7 | "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2009)/Include" | ||
| 6 | "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Include" | 8 | "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Include" |
| 7 | "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Include" | 9 | "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Include" |
| 8 | "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2008)/Include" | 10 | "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2008)/Include" |
| @@ -23,6 +25,8 @@ if (VIEWER AND WINDOWS) | |||
| 23 | 25 | ||
| 24 | find_path(DIRECTX_LIBRARY_DIR dxguid.lib | 26 | find_path(DIRECTX_LIBRARY_DIR dxguid.lib |
| 25 | "$ENV{DXSDK_DIR}/Lib/x86" | 27 | "$ENV{DXSDK_DIR}/Lib/x86" |
| 28 | "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2010)/Lib/x86" | ||
| 29 | "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2009)/Lib/x86" | ||
| 26 | "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Lib/x86" | 30 | "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Lib/x86" |
| 27 | "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Lib/x86" | 31 | "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Lib/x86" |
| 28 | "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2008)/Lib/x86" | 32 | "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2008)/Lib/x86" |