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

Side by Side Diff: gpu/gpu.gyp

Issue 1739013: Temporarily removed references to angleproject. It will be added back when an... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # This is defined here because we need to compile this set of files 8 # This is defined here because we need to compile this set of files
9 # twice with different defines. Once so it calls real GL, again so it 9 # twice with different defines. Once so it calls real GL, again so it
10 # calls mock GL for the unit tests. 10 # calls mock GL for the unit tests.
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 'conditions': [ 284 'conditions': [
285 ['OS == "linux"', 285 ['OS == "linux"',
286 { 286 {
287 'dependencies': [ 287 'dependencies': [
288 '../build/linux/system.gyp:gtk', 288 '../build/linux/system.gyp:gtk',
289 ], 289 ],
290 }, 290 },
291 ], 291 ],
292 #TODO(alokp): Remove os-conditional when translator_glsl starts 292 #TODO(alokp): Remove os-conditional when translator_glsl starts
293 #compiling on all platforms. 293 #compiling on all platforms.
294 ['OS == "win"', 294 #['OS == "win"',
295 { 295 # {
296 'dependencies': [ 296 # 'dependencies': [
297 '../third_party/angleproject/src/build_angle.gyp:translator_glsl', 297 # '../third_party/angleproject/src/build_angle.gyp:translator_glsl' ,
298 ], 298 # ],
299 }, 299 # },
300 ], 300 #],
301 ], 301 ],
302 }, 302 },
303 { 303 {
304 'target_name': 'gpu_plugin', 304 'target_name': 'gpu_plugin',
305 'type': 'static_library', 305 'type': 'static_library',
306 'dependencies': [ 306 'dependencies': [
307 '../base/base.gyp:base', 307 '../base/base.gyp:base',
308 'command_buffer_service', 308 'command_buffer_service',
309 ], 309 ],
310 'include_dirs': [ 310 'include_dirs': [
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 }, 443 },
444 ], 444 ],
445 ], 445 ],
446 } 446 }
447 447
448 # Local Variables: 448 # Local Variables:
449 # tab-width:2 449 # tab-width:2
450 # indent-tabs-mode:nil 450 # indent-tabs-mode:nil
451 # End: 451 # End:
452 # vim: set expandtab tabstop=2 shiftwidth=2: 452 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698