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

Side by Side Diff: ui/gfx/gfx.gyp

Issue 2127313002: Revert of Link to DirectWrite directly, instead of calling LoadLibrary (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 | « ui/gfx/font_fallback_win.cc ('k') | ui/gfx/gfx_tests.gyp » ('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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 'gdi_util.h', 410 'gdi_util.h',
411 'icon_util.cc', 411 'icon_util.cc',
412 'icon_util.h', 412 'icon_util.h',
413 'sys_color_change_listener.cc', 413 'sys_color_change_listener.cc',
414 'sys_color_change_listener.h', 414 'sys_color_change_listener.h',
415 ], 415 ],
416 # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int 416 # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int
417 # C4324 is structure was padded due to __declspec(align()), which is 417 # C4324 is structure was padded due to __declspec(align()), which is
418 # uninteresting. 418 # uninteresting.
419 'msvs_disabled_warnings': [ 4267, 4324 ], 419 'msvs_disabled_warnings': [ 4267, 4324 ],
420 'msvs_settings': {
421 'VCLinkerTool': {
422 'AdditionalDependencies': [
423 'dwrite.lib',
424 ]
425 }
426 }
427 }], 420 }],
428 ['OS=="mac"', { 421 ['OS=="mac"', {
429 'link_settings': { 422 'link_settings': {
430 'libraries': [ 423 'libraries': [
431 '$(SDKROOT)/System/Library/Frameworks/IOSurface.framework', 424 '$(SDKROOT)/System/Library/Frameworks/IOSurface.framework',
432 ], 425 ],
433 }, 426 },
434 }], 427 }],
435 ['OS=="android"', { 428 ['OS=="android"', {
436 'sources!': [ 429 'sources!': [
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 ], 609 ],
617 'variables': { 610 'variables': {
618 'jni_gen_package': 'ui/gfx', 611 'jni_gen_package': 'ui/gfx',
619 }, 612 },
620 'includes': [ '../../build/jni_generator.gypi' ], 613 'includes': [ '../../build/jni_generator.gypi' ],
621 }, 614 },
622 ], 615 ],
623 }], 616 }],
624 ], 617 ],
625 } 618 }
OLDNEW
« no previous file with comments | « ui/gfx/font_fallback_win.cc ('k') | ui/gfx/gfx_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698