Commit ea0c84d1 by John Abd-El-Malek Committed by Jamie Madill

Copy the D3D compiler dll in the GN build.

Change-Id: I773a411d07991d9ae160267eba8325c327146554 Reviewed-on: https://chromium-review.googlesource.com/229007Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarJohn Abd-El-Malek <jam@chromium.org>
parent ac6ff938
...@@ -147,6 +147,12 @@ if (is_win) { ...@@ -147,6 +147,12 @@ if (is_win) {
angle_enable_d3d9 = true angle_enable_d3d9 = true
angle_enable_d3d11 = true angle_enable_d3d11 = true
import("//build/config/win/visual_studio_version.gni")
copy("copy_compiler_dll") {
sources = [ "$windows_sdk_path/Redist/D3D/$cpu_arch/d3dcompiler_47.dll" ]
outputs = [ "$root_build_dir/d3dcompiler_47.dll" ]
}
shared_library("libGLESv2") { shared_library("libGLESv2") {
sources = rebase_path(gles_gypi.angle_libangle_sources, ".", "src") sources = rebase_path(gles_gypi.angle_libangle_sources, ".", "src")
sources += [ sources += [
...@@ -204,7 +210,7 @@ if (is_win) { ...@@ -204,7 +210,7 @@ if (is_win) {
":commit_id", ":commit_id",
":includes", ":includes",
":translator", ":translator",
#":copy_compiler_dll", TODO(GYP) ":copy_compiler_dll",
] ]
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment