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

Side by Side Diff: gyp/common_conditions.gypi

Issue 335123010: Make LTCG optional on windows builds. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 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
« no previous file with comments | « no previous file | gyp/common_variables.gypi » ('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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 'GenerateDebugInformation': 'true', # /DEBUG 79 'GenerateDebugInformation': 'true', # /DEBUG
80 'LinkIncremental': '2', # /INCREMENTAL 80 'LinkIncremental': '2', # /INCREMENTAL
81 }, 81 },
82 }, 82 },
83 }, 83 },
84 'Release': { 84 'Release': {
85 'msvs_settings': { 85 'msvs_settings': {
86 'VCCLCompilerTool': { 86 'VCCLCompilerTool': {
87 'DebugInformationFormat': '3', # programDatabase (/Zi) 87 'DebugInformationFormat': '3', # programDatabase (/Zi)
88 'Optimization': '<(skia_release_optimization_level)', 88 'Optimization': '<(skia_release_optimization_level)',
89 'WholeProgramOptimization': 'true', #/GL
90 # Changing the floating point model requires rebaseling gm images 89 # Changing the floating point model requires rebaseling gm images
91 #'FloatingPointModel': '2', # fast (/fp:fast) 90 #'FloatingPointModel': '2', # fast (/fp:fast)
92 'FavorSizeOrSpeed': '1', # speed (/Ot) 91 'FavorSizeOrSpeed': '1', # speed (/Ot)
93 'PreprocessorDefinitions': ['NDEBUG'], 92 'PreprocessorDefinitions': ['NDEBUG'],
94 'RuntimeLibrary': '2', # rtMultiThreadedDLL (/MD) 93 'RuntimeLibrary': '2', # rtMultiThreadedDLL (/MD)
95 'EnableEnhancedInstructionSet': '2',# /arch:SSE2 94 'EnableEnhancedInstructionSet': '2',# /arch:SSE2
96 'RuntimeTypeInfo': 'false', # /GR- 95 'RuntimeTypeInfo': 'false', # /GR-
97 }, 96 },
98 'VCLinkerTool': { 97 'VCLinkerTool': {
99 'GenerateDebugInformation': 'true', # /DEBUG 98 'GenerateDebugInformation': 'true', # /DEBUG
100 'LinkTimeCodeGeneration': '1', # useLinkTimeCodeGeneration /LTCG
101 },
102 'VCLibrarianTool': {
103 'LinkTimeCodeGeneration': 'true', # useLinkTimeCodeGeneration /LTCG
104 }, 99 },
105 }, 100 },
106 }, 101 },
107 }, 102 },
108 'conditions' : [ 103 'conditions' : [
109 # Gyp's ninja generator depends on these specially named 104 # Gyp's ninja generator depends on these specially named
110 # configurations to build 64-bit on Windows. 105 # configurations to build 64-bit on Windows.
111 # See http://skbug.com/2348 106 # See http://skbug.com/2348
112 # 107 #
113 # We handle the 64- vs 32-bit variations elsewhere, so I think it's 108 # We handle the 64- vs 32-bit variations elsewhere, so I think it's
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 }], 142 }],
148 [ 'skia_win_exceptions', { 143 [ 'skia_win_exceptions', {
149 'msvs_settings': { 144 'msvs_settings': {
150 'VCCLCompilerTool': { 145 'VCCLCompilerTool': {
151 'AdditionalOptions': [ 146 'AdditionalOptions': [
152 '/EHsc', 147 '/EHsc',
153 ], 148 ],
154 }, 149 },
155 }, 150 },
156 }], 151 }],
152 [ 'skia_win_ltcg', {
mtklein 2014/06/26 19:00:50 Even skia_ltcg or just ltcg? I'm not really sure
153 'configurations': {
154 'Release': {
155 'msvs_settings': {
156 'VCCLCompilerTool': {
157 'WholeProgramOptimization': 'true', #/GL
158 },
159 'VCLinkerTool': {
160 'LinkTimeCodeGeneration': '1', # useLinkTimeCodeGenerat ion /LTCG
161 },
162 'VCLibrarianTool': {
163 'LinkTimeCodeGeneration': 'true', # useLinkTimeCodeGenerat ion /LTCG
164 },
165 },
166 },
167 },
168 }],
157 ], 169 ],
158 }, 170 },
159 ], 171 ],
160 172
161 # The following section is common to linux + derivatives and android 173 # The following section is common to linux + derivatives and android
162 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"]', 174 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"]',
163 { 175 {
164 'cflags': [ 176 'cflags': [
165 '-g', 177 '-g',
166 '-fno-exceptions', 178 '-fno-exceptions',
(...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after
677 # add flags here (e.g. SK_SUPPORT_LEGACY_...) needed by moz2d 689 # add flags here (e.g. SK_SUPPORT_LEGACY_...) needed by moz2d
678 ], 690 ],
679 }], 691 }],
680 692
681 ], # end 'conditions' 693 ], # end 'conditions'
682 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 694 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
683 'xcode_settings': { 695 'xcode_settings': {
684 'SYMROOT': '<(DEPTH)/xcodebuild', 696 'SYMROOT': '<(DEPTH)/xcodebuild',
685 }, 697 },
686 } 698 }
OLDNEW
« no previous file with comments | « no previous file | gyp/common_variables.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698