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

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

Issue 2117683002: 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 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 'gdi_util.h', 409 'gdi_util.h',
410 'icon_util.cc', 410 'icon_util.cc',
411 'icon_util.h', 411 'icon_util.h',
412 'sys_color_change_listener.cc', 412 'sys_color_change_listener.cc',
413 'sys_color_change_listener.h', 413 'sys_color_change_listener.h',
414 ], 414 ],
415 # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int 415 # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int
416 # C4324 is structure was padded due to __declspec(align()), which is 416 # C4324 is structure was padded due to __declspec(align()), which is
417 # uninteresting. 417 # uninteresting.
418 'msvs_disabled_warnings': [ 4267, 4324 ], 418 'msvs_disabled_warnings': [ 4267, 4324 ],
419 'msvs_settings': {
420 'VCLinkerTool': {
421 'AdditionalDependencies': [
422 'dwrite.lib',
423 ]
424 }
425 }
426 }], 419 }],
427 ['OS=="mac"', { 420 ['OS=="mac"', {
428 'link_settings': { 421 'link_settings': {
429 'libraries': [ 422 'libraries': [
430 '$(SDKROOT)/System/Library/Frameworks/IOSurface.framework', 423 '$(SDKROOT)/System/Library/Frameworks/IOSurface.framework',
431 ], 424 ],
432 }, 425 },
433 }], 426 }],
434 ['OS=="android"', { 427 ['OS=="android"', {
435 'sources!': [ 428 'sources!': [
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
615 ], 608 ],
616 'variables': { 609 'variables': {
617 'jni_gen_package': 'ui/gfx', 610 'jni_gen_package': 'ui/gfx',
618 }, 611 },
619 'includes': [ '../../build/jni_generator.gypi' ], 612 'includes': [ '../../build/jni_generator.gypi' ],
620 }, 613 },
621 ], 614 ],
622 }], 615 }],
623 ], 616 ],
624 } 617 }
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