diff options
| author | manuel <manuel@mausz.at> | 2018-01-01 13:40:09 +0100 |
|---|---|---|
| committer | manuel <manuel@mausz.at> | 2018-01-01 13:40:09 +0100 |
| commit | 4830f27a40323fe859dc166337a2b861877b7121 (patch) | |
| tree | 39e9f712a5415ec0026c3914f4bf600b2f679287 /cmake/modules/FindD3DX11Effects.cmake | |
| parent | 0afb1d4d51973cf52973617c92236d851a039d31 (diff) | |
| download | kodi-pvr-build-4830f27a40323fe859dc166337a2b861877b7121.tar.gz kodi-pvr-build-4830f27a40323fe859dc166337a2b861877b7121.tar.bz2 kodi-pvr-build-4830f27a40323fe859dc166337a2b861877b7121.zip | |
sync with upstream
Diffstat (limited to 'cmake/modules/FindD3DX11Effects.cmake')
| -rw-r--r-- | cmake/modules/FindD3DX11Effects.cmake | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/cmake/modules/FindD3DX11Effects.cmake b/cmake/modules/FindD3DX11Effects.cmake index 3fdf7d7..9b1eb15 100644 --- a/cmake/modules/FindD3DX11Effects.cmake +++ b/cmake/modules/FindD3DX11Effects.cmake | |||
| @@ -4,23 +4,26 @@ | |||
| 4 | # D3DCOMPILER_DLL - Path to the Direct3D Compiler | 4 | # D3DCOMPILER_DLL - Path to the Direct3D Compiler |
| 5 | # FXC - Path to the DirectX Effects Compiler (FXC) | 5 | # FXC - Path to the DirectX Effects Compiler (FXC) |
| 6 | 6 | ||
| 7 | find_file(D3DCOMPILER_DLL | 7 | if(NOT CORE_SYSTEM_NAME STREQUAL windowsstore) |
| 8 | NAMES d3dcompiler_47.dll d3dcompiler_46.dll | 8 | find_file(D3DCOMPILER_DLL |
| 9 | PATHS | 9 | NAMES d3dcompiler_47.dll d3dcompiler_46.dll |
| 10 | "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Microsoft SDKs\\Windows\\v10.0;InstallationFolder]/Redist/D3D/${SDK_TARGET_ARCH}" | 10 | PATHS |
| 11 | "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Microsoft SDKs\\Windows\\v8.1;InstallationFolder]/Redist/D3D/${SDK_TARGET_ARCH}" | 11 | "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Microsoft SDKs\\Windows\\v10.0;InstallationFolder]/Redist/D3D/${SDK_TARGET_ARCH}" |
| 12 | "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Microsoft SDKs\\Windows\\v8.0;InstallationFolder]/Redist/D3D/${SDK_TARGET_ARCH}" | 12 | "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Microsoft SDKs\\Windows\\v8.1;InstallationFolder]/Redist/D3D/${SDK_TARGET_ARCH}" |
| 13 | "$ENV{WindowsSdkDir}Redist/d3d/${SDK_TARGET_ARCH}" | 13 | "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Microsoft SDKs\\Windows\\v8.0;InstallationFolder]/Redist/D3D/${SDK_TARGET_ARCH}" |
| 14 | NO_DEFAULT_PATH) | 14 | "$ENV{WindowsSdkDir}Redist/d3d/${SDK_TARGET_ARCH}" |
| 15 | if(NOT D3DCOMPILER_DLL) | 15 | NO_DEFAULT_PATH) |
| 16 | message(WARNING "Could NOT find Direct3D Compiler") | 16 | if(NOT D3DCOMPILER_DLL) |
| 17 | message(WARNING "Could NOT find Direct3D Compiler") | ||
| 18 | endif() | ||
| 19 | mark_as_advanced(D3DCOMPILER_DLL) | ||
| 20 | copy_file_to_buildtree(${D3DCOMPILER_DLL} DIRECTORY .) | ||
| 17 | endif() | 21 | endif() |
| 18 | mark_as_advanced(D3DCOMPILER_DLL) | ||
| 19 | copy_file_to_buildtree(${D3DCOMPILER_DLL} DIRECTORY .) | ||
| 20 | 22 | ||
| 21 | find_program(FXC fxc | 23 | find_program(FXC fxc |
| 22 | PATHS | 24 | PATHS |
| 23 | "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Microsoft SDKs\\Windows\\v10.0;InstallationFolder]/bin/x86" | 25 | "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Microsoft SDKs\\Windows\\v10.0;InstallationFolder]/bin/x86" |
| 26 | "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Microsoft SDKs\\Windows\\v10.0;InstallationFolder]/bin/[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Microsoft SDKs\\Windows\\v10.0;ProductVersion].0/x86" | ||
| 24 | "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Microsoft SDKs\\Windows\\v8.1;InstallationFolder]/bin/x86" | 27 | "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Microsoft SDKs\\Windows\\v8.1;InstallationFolder]/bin/x86" |
| 25 | "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Microsoft SDKs\\Windows\\v8.0;InstallationFolder]/bin/x86" | 28 | "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Microsoft SDKs\\Windows\\v8.0;InstallationFolder]/bin/x86" |
| 26 | "$ENV{WindowsSdkDir}bin/x86") | 29 | "$ENV{WindowsSdkDir}bin/x86") |