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

Side by Side Diff: content/content_gpu.gypi

Issue 18161007: Replace angle_path gyp variable with regular path. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@d3d11
Patch Set: rebase Created 7 years, 5 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/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 ], 19 ],
20 'include_dirs': [ 20 'include_dirs': [
21 '..', 21 '..',
22 ], 22 ],
23 'conditions': [ 23 'conditions': [
24 ['OS=="win"', { 24 ['OS=="win"', {
25 'include_dirs': [ 25 'include_dirs': [
26 '<(DEPTH)/third_party/khronos', 26 '<(DEPTH)/third_party/khronos',
27 '<(angle_path)/src', 27 '<(DEPTH)/third_party/angle_dx11/src',
28 '<(DEPTH)/third_party/wtl/include', 28 '<(DEPTH)/third_party/wtl/include',
29 ], 29 ],
30 'dependencies': [ 30 'dependencies': [
31 '<(angle_path)/src/build_angle.gyp:libEGL', 31 '../third_party/angle_dx11/src/build_angle.gyp:libEGL',
32 '<(angle_path)/src/build_angle.gyp:libGLESv2', 32 '../third_party/angle_dx11/src/build_angle.gyp:libGLESv2',
33 ], 33 ],
34 'link_settings': { 34 'link_settings': {
35 'libraries': [ 35 'libraries': [
36 '-lsetupapi.lib', 36 '-lsetupapi.lib',
37 ], 37 ],
38 }, 38 },
39 'copies': [ 39 'copies': [
40 { 40 {
41 'destination': '<(PRODUCT_DIR)', 41 'destination': '<(PRODUCT_DIR)',
42 'files': [ 42 'files': [
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 '<(DEPTH)/third_party/openmax/il', 75 '<(DEPTH)/third_party/openmax/il',
76 ], 76 ],
77 }], 77 }],
78 ['target_arch!="arm" and chromeos == 1', { 78 ['target_arch!="arm" and chromeos == 1', {
79 'include_dirs': [ 79 'include_dirs': [
80 '<(DEPTH)/third_party/libva', 80 '<(DEPTH)/third_party/libva',
81 ], 81 ],
82 }], 82 }],
83 ], 83 ],
84 } 84 }
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