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

Side by Side Diff: gyp/common_conditions.gypi

Issue 247143003: gyp: only include windows *_x64 targets if GYP_GENERATORS includes ninja (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 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 | « no previous file | no next file » | 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 }, 84 },
85 'VCLinkerTool': { 85 'VCLinkerTool': {
86 'GenerateDebugInformation': 'true', # /DEBUG 86 'GenerateDebugInformation': 'true', # /DEBUG
87 'LinkTimeCodeGeneration': '1', # useLinkTimeCodeGeneration /LTCG 87 'LinkTimeCodeGeneration': '1', # useLinkTimeCodeGeneration /LTCG
88 }, 88 },
89 'VCLibrarianTool': { 89 'VCLibrarianTool': {
90 'LinkTimeCodeGeneration': 'true', # useLinkTimeCodeGeneration /LTCG 90 'LinkTimeCodeGeneration': 'true', # useLinkTimeCodeGeneration /LTCG
91 }, 91 },
92 }, 92 },
93 }, 93 },
94 },
95 'conditions' : [
94 # Gyp's ninja generator depends on these specially named 96 # Gyp's ninja generator depends on these specially named
95 # configurations to build 64-bit on Windows. 97 # configurations to build 64-bit on Windows.
96 # See http://skbug.com/2348 98 # See http://skbug.com/2348
97 # 99 #
98 # We handle the 64- vs 32-bit variations elsewhere, so I think it's 100 # We handle the 64- vs 32-bit variations elsewhere, so I think it's
99 # OK for us to just make these inherit non-archwidth-specific 101 # OK for us to just make these inherit non-archwidth-specific
100 # configurations without modification. 102 # configurations without modification.
101 'Debug_x64': { 103 #
102 'inherit_from': ['Debug'], 104 # See http://skbug.com/2442 : These targets cause problems in the
103 }, 105 # MSVS build, so only include them if gyp is generating a ninja build.
104 'Release_x64': { 106 [ '"ninja" in "<!(echo %GYP_GENERATORS%)"', {
105 'inherit_from': ['Release'], 107 'configurations': {
106 }, 108 'Debug_x64': {
107 'Release_Developer_x64': { 109 'inherit_from': ['Debug'],
108 'inherit_from': ['Release_Developer'], 110 },
109 }, 111 'Release_x64': {
110 }, 112 'inherit_from': ['Release'],
111 'conditions' : [ 113 },
114 'Release_Developer_x64': {
115 'inherit_from': ['Release_Developer'],
116 },
117 },
118 }],
112 [ 'skia_arch_width == 64', { 119 [ 'skia_arch_width == 64', {
113 'msvs_configuration_platform': 'x64', 120 'msvs_configuration_platform': 'x64',
114 }], 121 }],
115 [ 'skia_arch_width == 32', { 122 [ 'skia_arch_width == 32', {
116 'msvs_configuration_platform': 'Win32', 123 'msvs_configuration_platform': 'Win32',
117 }], 124 }],
118 [ 'skia_warnings_as_errors', { 125 [ 'skia_warnings_as_errors', {
119 'msvs_settings': { 126 'msvs_settings': {
120 'VCCLCompilerTool': { 127 'VCCLCompilerTool': {
121 'WarnAsError': 'true', 128 'WarnAsError': 'true',
(...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after
609 'defines': [ 616 'defines': [
610 'SK_USE_POSIX_THREADS', 617 'SK_USE_POSIX_THREADS',
611 ], 618 ],
612 }], 619 }],
613 ], # end 'conditions' 620 ], # end 'conditions'
614 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 621 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
615 'xcode_settings': { 622 'xcode_settings': {
616 'SYMROOT': '<(DEPTH)/xcodebuild', 623 'SYMROOT': '<(DEPTH)/xcodebuild',
617 }, 624 },
618 } 625 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698