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

Side by Side Diff: gyp/common_conditions.gypi

Issue 66783003: Remove SK_FONTHOST_USES_FONTMGR. (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 1 month 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 | include/core/SkFontHost.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # conditions used in both common.gypi and skia.gyp in chromium 1 # conditions used in both common.gypi and skia.gyp in chromium
2 # 2 #
3 { 3 {
4 'defines': [ 4 'defines': [
5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', 5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
6 ], 6 ],
7 'conditions' : [ 7 'conditions' : [
8 [ 'skia_gpu == 1', 8 [ 'skia_gpu == 1',
9 { 9 {
10 'defines': [ 10 'defines': [
(...skipping 13 matching lines...) Expand all
24 }, { 24 }, {
25 'defines': [ 25 'defines': [
26 'SK_SUPPORT_OPENCL=0', 26 'SK_SUPPORT_OPENCL=0',
27 ], 27 ],
28 }, 28 },
29 ], 29 ],
30 [ 'skia_os == "win"', 30 [ 'skia_os == "win"',
31 { 31 {
32 'defines': [ 32 'defines': [
33 'SK_BUILD_FOR_WIN32', 33 'SK_BUILD_FOR_WIN32',
34 'SK_FONTHOST_USES_FONTMGR',
35 '_CRT_SECURE_NO_WARNINGS', 34 '_CRT_SECURE_NO_WARNINGS',
36 'GR_GL_FUNCTION_TYPE=__stdcall', 35 'GR_GL_FUNCTION_TYPE=__stdcall',
37 ], 36 ],
38 'msvs_cygwin_shell': 0, 37 'msvs_cygwin_shell': 0,
39 'msvs_settings': { 38 'msvs_settings': {
40 'VCCLCompilerTool': { 39 'VCCLCompilerTool': {
41 'WarningLevel': '3', 40 'WarningLevel': '3',
42 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb', 41 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb',
43 'DebugInformationFormat': '3', 42 'DebugInformationFormat': '3',
44 'ExceptionHandling': '0', 43 'ExceptionHandling': '0',
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 }, 309 },
311 ], 310 ],
312 311
313 [ 'skia_os == "mac"', 312 [ 'skia_os == "mac"',
314 { 313 {
315 'variables': { 314 'variables': {
316 'mac_sdk%': '<!(python <(DEPTH)/tools/find_mac_sdk.py 10.6)', 315 'mac_sdk%': '<!(python <(DEPTH)/tools/find_mac_sdk.py 10.6)',
317 }, 316 },
318 'defines': [ 317 'defines': [
319 'SK_BUILD_FOR_MAC', 318 'SK_BUILD_FOR_MAC',
320 'SK_FONTHOST_USES_FONTMGR',
321 ], 319 ],
322 'conditions' : [ 320 'conditions' : [
323 [ 'skia_arch_width == 64', { 321 [ 'skia_arch_width == 64', {
324 'xcode_settings': { 322 'xcode_settings': {
325 'ARCHS': ['x86_64'], 323 'ARCHS': ['x86_64'],
326 }, 324 },
327 }], 325 }],
328 [ 'skia_arch_width == 32', { 326 [ 'skia_arch_width == 32', {
329 'xcode_settings': { 327 'xcode_settings': {
330 'ARCHS': ['i386'], 328 'ARCHS': ['i386'],
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 'xcode_settings': { 499 'xcode_settings': {
502 'SYMROOT': '<(DEPTH)/xcodebuild', 500 'SYMROOT': '<(DEPTH)/xcodebuild',
503 }, 501 },
504 } 502 }
505 503
506 # Local Variables: 504 # Local Variables:
507 # tab-width:2 505 # tab-width:2
508 # indent-tabs-mode:nil 506 # indent-tabs-mode:nil
509 # End: 507 # End:
510 # vim: set expandtab tabstop=2 shiftwidth=2: 508 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | include/core/SkFontHost.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698