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

Side by Side Diff: content/content_gpu.gypi

Issue 614053003: Replace build_angle.gyp with angle.gyp. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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_browser.gypi ('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 '../mojo/mojo_base.gyp:mojo_application_bindings', 8 '../mojo/mojo_base.gyp:mojo_application_bindings',
9 '../skia/skia.gyp:skia', 9 '../skia/skia.gyp:skia',
10 '../ui/gl/gl.gyp:gl', 10 '../ui/gl/gl.gyp:gl',
(...skipping 13 matching lines...) Expand all
24 '..', 24 '..',
25 ], 25 ],
26 'conditions': [ 26 'conditions': [
27 ['OS=="win"', { 27 ['OS=="win"', {
28 'include_dirs': [ 28 'include_dirs': [
29 '<(DEPTH)/third_party/khronos', 29 '<(DEPTH)/third_party/khronos',
30 '<(angle_path)/src', 30 '<(angle_path)/src',
31 '<(DEPTH)/third_party/wtl/include', 31 '<(DEPTH)/third_party/wtl/include',
32 ], 32 ],
33 'dependencies': [ 33 'dependencies': [
34 '<(angle_path)/src/build_angle.gyp:libEGL', 34 '<(angle_path)/src/angle.gyp:libEGL',
35 '<(angle_path)/src/build_angle.gyp:libGLESv2', 35 '<(angle_path)/src/angle.gyp:libGLESv2',
36 ], 36 ],
37 'link_settings': { 37 'link_settings': {
38 'libraries': [ 38 'libraries': [
39 '-lsetupapi.lib', 39 '-lsetupapi.lib',
40 ], 40 ],
41 }, 41 },
42 }], 42 }],
43 ['target_arch!="arm" and chromeos == 1', { 43 ['target_arch!="arm" and chromeos == 1', {
44 'include_dirs': [ 44 'include_dirs': [
45 '<(DEPTH)/third_party/libva', 45 '<(DEPTH)/third_party/libva',
46 ], 46 ],
47 }], 47 }],
48 ], 48 ],
49 } 49 }
OLDNEW
« no previous file with comments | « content/content_browser.gypi ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698