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

Side by Side Diff: content/content_common.gypi

Issue 10392068: ui: Move gl/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac_rel Created 8 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 | « content/content_browser.gypi ('k') | content/content_gpu.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 '../build/temp_gyp/googleurl.gyp:googleurl', 8 '../build/temp_gyp/googleurl.gyp:googleurl',
9 '../gpu/gpu.gyp:gles2_implementation', 9 '../gpu/gpu.gyp:gles2_implementation',
10 '../gpu/gpu.gyp:gpu_ipc', 10 '../gpu/gpu.gyp:gpu_ipc',
11 '../ipc/ipc.gyp:ipc', 11 '../ipc/ipc.gyp:ipc',
12 '../media/media.gyp:media', 12 '../media/media.gyp:media',
13 '../net/net.gyp:net', 13 '../net/net.gyp:net',
14 '../skia/skia.gyp:skia', 14 '../skia/skia.gyp:skia',
15 '../third_party/icu/icu.gyp:icuuc', 15 '../third_party/icu/icu.gyp:icuuc',
16 '../third_party/npapi/npapi.gyp:npapi', 16 '../third_party/npapi/npapi.gyp:npapi',
17 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', 17 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
18 '../ui/gfx/gl/gl.gyp:gl', 18 '../ui/gl/gl.gyp:gl',
19 '../ui/ui.gyp:ui', 19 '../ui/ui.gyp:ui',
20 '../webkit/support/webkit_support.gyp:appcache', 20 '../webkit/support/webkit_support.gyp:appcache',
21 '../webkit/support/webkit_support.gyp:blob', 21 '../webkit/support/webkit_support.gyp:blob',
22 '../webkit/support/webkit_support.gyp:database', 22 '../webkit/support/webkit_support.gyp:database',
23 '../webkit/support/webkit_support.gyp:fileapi', 23 '../webkit/support/webkit_support.gyp:fileapi',
24 ], 24 ],
25 'include_dirs': [ 25 'include_dirs': [
26 '..', 26 '..',
27 ], 27 ],
28 'export_dependent_settings': [ 28 'export_dependent_settings': [
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 'link_settings': { 385 'link_settings': {
386 'libraries': [ 386 'libraries': [
387 '-lEGL', 387 '-lEGL',
388 '-lGLESv2', 388 '-lGLESv2',
389 ], 389 ],
390 }, 390 },
391 }], 391 }],
392 ['OS=="win"', { 392 ['OS=="win"', {
393 'dependencies': [ 393 'dependencies': [
394 '../media/media.gyp:media', 394 '../media/media.gyp:media',
395 '../ui/gfx/gl/gl.gyp:gl', 395 '../ui/gl/gl.gyp:gl',
396 ], 396 ],
397 'link_settings': { 397 'link_settings': {
398 'libraries': [ 398 'libraries': [
399 '-ld3d9.lib', 399 '-ld3d9.lib',
400 '-ld3dx9.lib', 400 '-ld3dx9.lib',
401 '-ldxva2.lib', 401 '-ldxva2.lib',
402 '-lstrmiids.lib', 402 '-lstrmiids.lib',
403 '-lmf.lib', 403 '-lmf.lib',
404 '-lmfplat.lib', 404 '-lmfplat.lib',
405 '-lmfuuid.lib', 405 '-lmfuuid.lib',
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 '../build/extract_from_cab.py', 444 '../build/extract_from_cab.py',
445 '..\\third_party\\directxsdk\\files\\Redist\\<(input)', 445 '..\\third_party\\directxsdk\\files\\Redist\\<(input)',
446 '<(output)', 446 '<(output)',
447 '<(PRODUCT_DIR)', 447 '<(PRODUCT_DIR)',
448 ], 448 ],
449 }, 449 },
450 ] 450 ]
451 }] 451 }]
452 ], 452 ],
453 } 453 }
OLDNEW
« no previous file with comments | « content/content_browser.gypi ('k') | content/content_gpu.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698