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

Side by Side Diff: gyp/common_conditions.gypi

Issue 206463007: change default build (in "make" wrapper) to ninja on all platforms (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 6 years, 8 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 | « Makefile ('k') | gyp_skia » ('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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 }, 78 },
79 'VCLinkerTool': { 79 'VCLinkerTool': {
80 'GenerateDebugInformation': 'true', # /DEBUG 80 'GenerateDebugInformation': 'true', # /DEBUG
81 'LinkTimeCodeGeneration': '1', # useLinkTimeCodeGeneration /LTCG 81 'LinkTimeCodeGeneration': '1', # useLinkTimeCodeGeneration /LTCG
82 }, 82 },
83 'VCLibrarianTool': { 83 'VCLibrarianTool': {
84 'LinkTimeCodeGeneration': 'true', # useLinkTimeCodeGeneration /LTCG 84 'LinkTimeCodeGeneration': 'true', # useLinkTimeCodeGeneration /LTCG
85 }, 85 },
86 }, 86 },
87 }, 87 },
88 # Gyp's ninja generator depends on these specially named
89 # configurations to build 64-bit on Windows.
90 # See http://skbug.com/2348
91 #
92 # We handle the 64- vs 32-bit variations elsewhere, so I think it's
93 # OK for us to just make these inherit non-archwidth-specific
94 # configurations without modification.
95 'Debug_x64': {
96 'inherit_from': ['Debug'],
97 },
98 'Release_x64': {
99 'inherit_from': ['Release'],
100 },
101 'Release_Developer_x64': {
102 'inherit_from': ['Release_Developer'],
103 },
88 }, 104 },
89 'conditions' : [ 105 'conditions' : [
90 [ 'skia_arch_width == 64', { 106 [ 'skia_arch_width == 64', {
91 'msvs_configuration_platform': 'x64', 107 'msvs_configuration_platform': 'x64',
92 }], 108 }],
93 [ 'skia_arch_width == 32', { 109 [ 'skia_arch_width == 32', {
94 'msvs_configuration_platform': 'Win32', 110 'msvs_configuration_platform': 'Win32',
95 }], 111 }],
96 [ 'skia_warnings_as_errors', { 112 [ 'skia_warnings_as_errors', {
97 'msvs_settings': { 113 'msvs_settings': {
(...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 'defines': [ 589 'defines': [
574 'SK_USE_POSIX_THREADS', 590 'SK_USE_POSIX_THREADS',
575 ], 591 ],
576 }], 592 }],
577 ], # end 'conditions' 593 ], # end 'conditions'
578 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 594 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
579 'xcode_settings': { 595 'xcode_settings': {
580 'SYMROOT': '<(DEPTH)/xcodebuild', 596 'SYMROOT': '<(DEPTH)/xcodebuild',
581 }, 597 },
582 } 598 }
OLDNEW
« no previous file with comments | « Makefile ('k') | gyp_skia » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698