aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--linden/indra/cmake/DirectX.cmake4
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 @@
3if (VIEWER AND WINDOWS) 3if (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"