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

Side by Side Diff: content/content_gpu.gypi

Issue 106623003: Update dependencies to use new angle repository. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years 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/browser/gpu/gpu_internals_ui.cc ('k') | content/content_tests.gypi » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'dependencies': [ 6 'dependencies': [
7 '../base/base.gyp:base', 7 '../base/base.gyp:base',
8 '../skia/skia.gyp:skia', 8 '../skia/skia.gyp:skia',
9 '../ui/gl/gl.gyp:gl', 9 '../ui/gl/gl.gyp:gl',
10 ], 10 ],
11 'sources': [ 11 'sources': [
12 'gpu/gpu_main.cc', 12 'gpu/gpu_main.cc',
13 'gpu/gpu_process.cc', 13 'gpu/gpu_process.cc',
14 'gpu/gpu_process.h', 14 'gpu/gpu_process.h',
15 'gpu/gpu_child_thread.cc', 15 'gpu/gpu_child_thread.cc',
16 'gpu/gpu_child_thread.h', 16 'gpu/gpu_child_thread.h',
17 'gpu/gpu_watchdog_thread.cc', 17 'gpu/gpu_watchdog_thread.cc',
18 'gpu/gpu_watchdog_thread.h', 18 'gpu/gpu_watchdog_thread.h',
19 'gpu/in_process_gpu_thread.cc', 19 'gpu/in_process_gpu_thread.cc',
20 'gpu/in_process_gpu_thread.h', 20 'gpu/in_process_gpu_thread.h',
21 ], 21 ],
22 'include_dirs': [ 22 'include_dirs': [
23 '..', 23 '..',
24 ], 24 ],
25 'conditions': [ 25 'conditions': [
26 ['OS=="win"', { 26 ['OS=="win"', {
27 'include_dirs': [ 27 'include_dirs': [
28 '<(DEPTH)/third_party/khronos', 28 '<(DEPTH)/third_party/khronos',
29 '<(DEPTH)/third_party/angle_dx11/src', 29 '<(angle_path)/src',
30 '<(DEPTH)/third_party/wtl/include', 30 '<(DEPTH)/third_party/wtl/include',
31 ], 31 ],
32 'dependencies': [ 32 'dependencies': [
33 '../third_party/angle_dx11/src/build_angle.gyp:libEGL', 33 '<(angle_path)/src/build_angle.gyp:libEGL',
34 '../third_party/angle_dx11/src/build_angle.gyp:libGLESv2', 34 '<(angle_path)/src/build_angle.gyp:libGLESv2',
35 ], 35 ],
36 'link_settings': { 36 'link_settings': {
37 'libraries': [ 37 'libraries': [
38 '-lsetupapi.lib', 38 '-lsetupapi.lib',
39 ], 39 ],
40 }, 40 },
41 }], 41 }],
42 ['OS=="win" and target_arch=="ia32" and directxsdk_exists=="True"', { 42 ['OS=="win" and target_arch=="ia32" and directxsdk_exists=="True"', {
43 # We don't support x64 prior to Win7 and D3DCompiler_43.dll is 43 # We don't support x64 prior to Win7 and D3DCompiler_43.dll is
44 # not needed on Vista+. 44 # not needed on Vista+.
(...skipping 21 matching lines...) Expand all
66 }, 66 },
67 ], 67 ],
68 }], 68 }],
69 ['target_arch!="arm" and chromeos == 1', { 69 ['target_arch!="arm" and chromeos == 1', {
70 'include_dirs': [ 70 'include_dirs': [
71 '<(DEPTH)/third_party/libva', 71 '<(DEPTH)/third_party/libva',
72 ], 72 ],
73 }], 73 }],
74 ], 74 ],
75 } 75 }
OLDNEW
« no previous file with comments | « content/browser/gpu/gpu_internals_ui.cc ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698