bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Marshall Greenblatt 2023-06-01 13:30:42 +03:00
parent 4a5500fcb9
commit c4d256c286
4 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/cef_variables.cmake.in
View File

@ -493,6 +493,7 @@ if(OS_WINDOWS)
# List of CEF binary files. # List of CEF binary files.
set(CEF_BINARY_FILES set(CEF_BINARY_FILES
chrome_elf.dll chrome_elf.dll
d3dcompiler_47.dll
libcef.dll libcef.dll
libEGL.dll libEGL.dll
libGLESv2.dll libGLESv2.dll
@ -503,12 +504,6 @@ if(OS_WINDOWS)
vulkan-1.dll vulkan-1.dll
) )
if(NOT PROJECT_ARCH STREQUAL "arm64")
list(APPEND CEF_BINARY_FILES
d3dcompiler_47.dll
)
endif()
# List of CEF resource files. # List of CEF resource files.
set(CEF_RESOURCE_FILES set(CEF_RESOURCE_FILES
chrome_100_percent.pak chrome_100_percent.pak

BIN
tools/distrib/win/x64/d3dcompiler_47.dll
View File

Binary file not shown.

BIN
tools/distrib/win/x86/d3dcompiler_47.dll
View File

Binary file not shown.

7
tools/make_distrib.py
View File

@ -887,6 +887,7 @@ if platform == 'windows':
# yapf: disable # yapf: disable
binaries = [ binaries = [
{'path': 'chrome_elf.dll'}, {'path': 'chrome_elf.dll'},
{'path': 'd3dcompiler_47.dll'},
{'path': libcef_dll}, {'path': libcef_dll},
{'path': 'libEGL.dll'}, {'path': 'libEGL.dll'},
{'path': 'libGLESv2.dll'}, {'path': 'libGLESv2.dll'},
@ -959,9 +960,6 @@ if platform == 'windows':
valid_build_dir = build_dir valid_build_dir = build_dir
dst_dir = os.path.join(output_dir, 'Debug') dst_dir = os.path.join(output_dir, 'Debug')
copy_files_list(build_dir, dst_dir, binaries) 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: if not options.nosymbols:
# create the symbol output directory # create the symbol output directory
@ -982,9 +980,6 @@ if platform == 'windows':
valid_build_dir = build_dir valid_build_dir = build_dir
dst_dir = os.path.join(output_dir, 'Release') dst_dir = os.path.join(output_dir, 'Release')
copy_files_list(build_dir, dst_dir, binaries) 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: if not options.nosymbols:
# create the symbol output directory # create the symbol output directory