diff options
Diffstat (limited to 'linden/indra/cmake/DirectX.cmake')
| -rw-r--r-- | linden/indra/cmake/DirectX.cmake | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/linden/indra/cmake/DirectX.cmake b/linden/indra/cmake/DirectX.cmake index 4d2d5e0..d406f37 100644 --- a/linden/indra/cmake/DirectX.cmake +++ b/linden/indra/cmake/DirectX.cmake | |||
| @@ -3,12 +3,13 @@ | |||
| 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 | "C:/Program Files/Microsoft DirectX SDK (June 2008)/Include" | 6 | "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Include" |
| 7 | "C:/Program Files/Microsoft DirectX SDK (March 2008)/Include" | 7 | "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Include" |
| 8 | "C:/Program Files/Microsoft DirectX SDK (November 2007)/Include" | 8 | "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2008)/Include" |
| 9 | "C:/Program Files/Microsoft DirectX SDK (August 2007)/Include" | 9 | "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (November 2007)/Include" |
| 10 | "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2007)/Include" | ||
| 10 | "C:/DX90SDK/Include" | 11 | "C:/DX90SDK/Include" |
| 11 | "C:/Program Files/DX90SDK/Include" | 12 | "$ENV{PROGRAMFILES}/DX90SDK/Include" |
| 12 | ) | 13 | ) |
| 13 | if (DIRECTX_INCLUDE_DIR) | 14 | if (DIRECTX_INCLUDE_DIR) |
| 14 | include_directories(${DIRECTX_INCLUDE_DIR}) | 15 | include_directories(${DIRECTX_INCLUDE_DIR}) |
| @@ -22,12 +23,13 @@ if (VIEWER AND WINDOWS) | |||
| 22 | 23 | ||
| 23 | find_path(DIRECTX_LIBRARY_DIR dxguid.lib | 24 | find_path(DIRECTX_LIBRARY_DIR dxguid.lib |
| 24 | "$ENV{DXSDK_DIR}/Lib/x86" | 25 | "$ENV{DXSDK_DIR}/Lib/x86" |
| 25 | "C:/Program Files/Microsoft DirectX SDK (June 2008)/Lib/x86" | 26 | "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Lib/x86" |
| 26 | "C:/Program Files/Microsoft DirectX SDK (March 2008)/Lib/x86" | 27 | "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Lib/x86" |
| 27 | "C:/Program Files/Microsoft DirectX SDK (November 2007)/Lib/x86" | 28 | "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2008)/Lib/x86" |
| 28 | "C:/Program Files/Microsoft DirectX SDK (August 2007)/Lib/x86" | 29 | "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (November 2007)/Lib/x86" |
| 30 | "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2007)/Lib/x86" | ||
| 29 | "C:/DX90SDK/Lib" | 31 | "C:/DX90SDK/Lib" |
| 30 | "C:/Program Files/DX90SDK/Lib" | 32 | "$ENV{PROGRAMFILES}/DX90SDK/Lib" |
| 31 | ) | 33 | ) |
| 32 | if (DIRECTX_LIBRARY_DIR) | 34 | if (DIRECTX_LIBRARY_DIR) |
| 33 | if (DIRECTX_FIND_QUIETLY) | 35 | if (DIRECTX_FIND_QUIETLY) |