win: Ship d3dcompiler_47.dll on ARM64 (fixes #3515)
Use the same file from the Windows SDK as Chromium on all architectures ("$windows_sdk_path/Redist/D3D/$target_cpu/d3dcompiler_47.dll").
This commit is contained in:
parent
5d8c6799fc
commit
cf8b7db4b4
|
@ -493,6 +493,7 @@ if(OS_WINDOWS)
|
|||
# List of CEF binary files.
|
||||
set(CEF_BINARY_FILES
|
||||
chrome_elf.dll
|
||||
d3dcompiler_47.dll
|
||||
libcef.dll
|
||||
libEGL.dll
|
||||
libGLESv2.dll
|
||||
|
@ -503,12 +504,6 @@ if(OS_WINDOWS)
|
|||
vulkan-1.dll
|
||||
)
|
||||
|
||||
if(NOT PROJECT_ARCH STREQUAL "arm64")
|
||||
list(APPEND CEF_BINARY_FILES
|
||||
d3dcompiler_47.dll
|
||||
)
|
||||
endif()
|
||||
|
||||
# List of CEF resource files.
|
||||
set(CEF_RESOURCE_FILES
|
||||
chrome_100_percent.pak
|
||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -887,6 +887,7 @@ if platform == 'windows':
|
|||
# yapf: disable
|
||||
binaries = [
|
||||
{'path': 'chrome_elf.dll'},
|
||||
{'path': 'd3dcompiler_47.dll'},
|
||||
{'path': libcef_dll},
|
||||
{'path': 'libEGL.dll'},
|
||||
{'path': 'libGLESv2.dll'},
|
||||
|
@ -959,9 +960,6 @@ if platform == 'windows':
|
|||
valid_build_dir = build_dir
|
||||
dst_dir = os.path.join(output_dir, 'Debug')
|
||||
copy_files_list(build_dir, dst_dir, binaries)
|
||||
copy_files(
|
||||
os.path.join(script_dir, 'distrib/win/%s/*.dll' % binary_arch),
|
||||
dst_dir, options.quiet)
|
||||
|
||||
if not options.nosymbols:
|
||||
# create the symbol output directory
|
||||
|
@ -982,9 +980,6 @@ if platform == 'windows':
|
|||
valid_build_dir = build_dir
|
||||
dst_dir = os.path.join(output_dir, 'Release')
|
||||
copy_files_list(build_dir, dst_dir, binaries)
|
||||
copy_files(
|
||||
os.path.join(script_dir, 'distrib/win/%s/*.dll' % binary_arch),
|
||||
dst_dir, options.quiet)
|
||||
|
||||
if not options.nosymbols:
|
||||
# create the symbol output directory
|
||||
|
|
Loading…
Reference in New Issue