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

Side by Side Diff: gyp/common_conditions.gypi

Issue 637863005: Revert of Start to vectorize SkTileGrid. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 2 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 | « bench/GeometryBench.cpp ('k') | include/core/SkTypes.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 'SK_SUPPORT_GPU=<(skia_gpu)', 6 'SK_SUPPORT_GPU=<(skia_gpu)',
7 'SK_SUPPORT_OPENCL=<(skia_opencl)', 7 'SK_SUPPORT_OPENCL=<(skia_opencl)',
8 'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)', 8 'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)',
9 ], 9 ],
10 'conditions' : [ 10 'conditions' : [
(...skipping 28 matching lines...) Expand all
39 { 39 {
40 'defines': [ 40 'defines': [
41 'SK_BUILD_FOR_WIN32', 41 'SK_BUILD_FOR_WIN32',
42 '_CRT_SECURE_NO_WARNINGS', 42 '_CRT_SECURE_NO_WARNINGS',
43 'GR_GL_FUNCTION_TYPE=__stdcall', 43 'GR_GL_FUNCTION_TYPE=__stdcall',
44 ], 44 ],
45 'msvs_disabled_warnings': [ 45 'msvs_disabled_warnings': [
46 4275, # An exported class was derived from a class that was not exp orted 46 4275, # An exported class was derived from a class that was not exp orted
47 4345, # This is an FYI about a behavior change from long ago. Chrom e stifles it too. 47 4345, # This is an FYI about a behavior change from long ago. Chrom e stifles it too.
48 4355, # 'this' used in base member initializer list. Off by default in newer compilers. 48 4355, # 'this' used in base member initializer list. Off by default in newer compilers.
49 4800, # forcing value to bool 'true' or 'false'
50 ], 49 ],
51 'msvs_cygwin_shell': 0, 50 'msvs_cygwin_shell': 0,
52 'msvs_settings': { 51 'msvs_settings': {
53 'VCCLCompilerTool': { 52 'VCCLCompilerTool': {
54 'WarningLevel': '3', 53 'WarningLevel': '3',
55 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb', 54 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb',
56 'DebugInformationFormat': '3', 55 'DebugInformationFormat': '3',
57 'ExceptionHandling': '0', 56 'ExceptionHandling': '0',
58 'AdditionalOptions': [ '/MP', ], 57 'AdditionalOptions': [ '/MP', ],
59 }, 58 },
(...skipping 574 matching lines...) Expand 10 before | Expand all | Expand 10 after
634 [ 'skia_is_bot', { 633 [ 'skia_is_bot', {
635 'defines': [ 'SK_CRASH_HANDLER' ], 634 'defines': [ 'SK_CRASH_HANDLER' ],
636 }], 635 }],
637 636
638 ], # end 'conditions' 637 ], # end 'conditions'
639 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 638 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
640 'xcode_settings': { 639 'xcode_settings': {
641 'SYMROOT': '<(DEPTH)/xcodebuild', 640 'SYMROOT': '<(DEPTH)/xcodebuild',
642 }, 641 },
643 } 642 }
OLDNEW
« no previous file with comments | « bench/GeometryBench.cpp ('k') | include/core/SkTypes.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698