Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(456)

Side by Side Diff: content/gpu/BUILD.gn

Issue 506633002: Remove the use of d3dcompiler_43.dll. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/content_gpu.gypi ('k') | ui/gl/gl_implementation_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/ui.gni") 5 import("//build/config/ui.gni")
6 import("//content/content.gni") 6 import("//content/content.gni")
7 7
8 # We don't support x64 prior to Win7 and D3DCompiler_43.dll is not needed on
9 # Vista+.
10 need_d3dcompiler = (is_win && cpu_arch == "x86" && directxsdk_exists)
11
12 source_set("gpu") { 8 source_set("gpu") {
13 # TODO(brettw) it seems like this should be only visible to content like 9 # TODO(brettw) it seems like this should be only visible to content like
14 # the other non-public content directories are. But this is depended on by 10 # the other non-public content directories are. But this is depended on by
15 # the chrome target. 11 # the chrome target.
16 12
17 sources = [ 13 sources = [
18 "gpu_main.cc", 14 "gpu_main.cc",
19 "gpu_process.cc", 15 "gpu_process.cc",
20 "gpu_process.h", 16 "gpu_process.h",
21 "gpu_child_thread.cc", 17 "gpu_child_thread.cc",
(...skipping 19 matching lines...) Expand all
41 "//third_party/khronos:khronos_headers", 37 "//third_party/khronos:khronos_headers",
42 "//third_party/wtl:wtl_includes", 38 "//third_party/wtl:wtl_includes",
43 ] 39 ]
44 libs = [ "setupapi.lib" ] 40 libs = [ "setupapi.lib" ]
45 deps += [ 41 deps += [
46 "//third_party/angle:libEGL", 42 "//third_party/angle:libEGL",
47 "//third_party/angle:libGLESv2", 43 "//third_party/angle:libGLESv2",
48 ] 44 ]
49 } 45 }
50 46
51 if (need_d3dcompiler) {
52 deps += [ ":extract_d3dcompiler" ]
53 }
54
55 if (is_chromeos && cpu_arch != "arm") { 47 if (is_chromeos && cpu_arch != "arm") {
56 configs += [ "//third_party/libva/libva_config" ] 48 configs += [ "//third_party/libva/libva_config" ]
57 } 49 }
58 50
59 if (use_x11) { 51 if (use_x11) {
60 deps += [ "//ui/events/platform/x11" ] 52 deps += [ "//ui/events/platform/x11" ]
61 } 53 }
62 } 54 }
63
64 if (need_d3dcompiler) {
65 action("extract_d3dcompiler") {
66 visibility = ":*"
67 script = "//build/extract_from_cab.py"
68
69 cabfile = "//third_party/directxsdk/files/Redist/Jun2010_D3DCompiler_43_x86. cab"
70 dllfile = "D3DCompiler_43.dll"
71
72 inputs = [ cabfile ]
73 outputs = [ "$root_out_dir/$dllfile" ]
74
75 args = [
76 rebase_path(cabfile, root_build_dir),
77 dllfile,
78 rebase_path(root_out_dir, root_build_dir),
79 ]
80 }
81 }
OLDNEW
« no previous file with comments | « content/content_gpu.gypi ('k') | ui/gl/gl_implementation_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698