From 583f532b172e25aaf8da531f2cd407df9b2793fa Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Fri, 21 Feb 2020 11:52:46 +0200 Subject: SL-12708 (Windows) Eliminate DirectX SDK June 2010 Install Requirement --- indra/cmake/DirectX.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'indra/cmake/DirectX.cmake') diff --git a/indra/cmake/DirectX.cmake b/indra/cmake/DirectX.cmake index 25163d0322..1741dc111f 100644 --- a/indra/cmake/DirectX.cmake +++ b/indra/cmake/DirectX.cmake @@ -1,8 +1,15 @@ # -*- cmake -*- if (WINDOWS) + if(ADDRESS_SIZE EQUAL 32) + set(PROGRAMFILES_x86 $ENV{PROGRAMFILES}) + else(ADDRESS_SIZE EQUAL 32) + set(PROGRAMFILES_x86 $ENV{PROGRAMFILES\(X86\)}) + endif(ADDRESS_SIZE EQUAL 32) + find_path(DIRECTX_INCLUDE_DIR dxdiag.h "$ENV{DXSDK_DIR}/Include" + "${PROGRAMFILES_x86}/Windows Kits/8.1/Include/um" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2010)/Include" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2009)/Include" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2009)/Include" @@ -26,6 +33,7 @@ if (WINDOWS) find_path(DIRECTX_LIBRARY_DIR dxguid.lib "$ENV{DXSDK_DIR}/Lib/x86" + "${PROGRAMFILES_x86}/Windows Kits/8.1/Lib/winv6.3/um/x86" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2010)/Lib/x86" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2009)/Lib/x86" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2009)/Lib/x86" -- cgit v1.2.3