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

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

Issue 2029343002: Link to DirectWrite directly, instead of calling LoadLibrary (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Link content_unittests to dwrite.dll 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
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 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 'gdi_util.h', 407 'gdi_util.h',
408 'icon_util.cc', 408 'icon_util.cc',
409 'icon_util.h', 409 'icon_util.h',
410 'sys_color_change_listener.cc', 410 'sys_color_change_listener.cc',
411 'sys_color_change_listener.h', 411 'sys_color_change_listener.h',
412 ], 412 ],
413 # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int 413 # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int
414 # C4324 is structure was padded due to __declspec(align()), which is 414 # C4324 is structure was padded due to __declspec(align()), which is
415 # uninteresting. 415 # uninteresting.
416 'msvs_disabled_warnings': [ 4267, 4324 ], 416 'msvs_disabled_warnings': [ 4267, 4324 ],
417 'msvs_settings': {
418 'VCLinkerTool': {
419 'AdditionalDependencies': [
420 'dwrite.lib',
421 ]
422 }
423 }
417 }], 424 }],
418 ['OS=="mac"', { 425 ['OS=="mac"', {
419 'link_settings': { 426 'link_settings': {
420 'libraries': [ 427 'libraries': [
421 '$(SDKROOT)/System/Library/Frameworks/IOSurface.framework', 428 '$(SDKROOT)/System/Library/Frameworks/IOSurface.framework',
422 ], 429 ],
423 }, 430 },
424 }], 431 }],
425 ['OS=="android"', { 432 ['OS=="android"', {
426 'sources!': [ 433 'sources!': [
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
606 ], 613 ],
607 'variables': { 614 'variables': {
608 'jni_gen_package': 'ui/gfx', 615 'jni_gen_package': 'ui/gfx',
609 }, 616 },
610 'includes': [ '../../build/jni_generator.gypi' ], 617 'includes': [ '../../build/jni_generator.gypi' ],
611 }, 618 },
612 ], 619 ],
613 }], 620 }],
614 ], 621 ],
615 } 622 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698