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

Side by Side Diff: gyp/common_conditions.gypi

Issue 17370005: Add gyp define for optimization level (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
« 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_HINTING_SCALE_FACTOR', 6 # 'SK_SUPPORT_HINTING_SCALE_FACTOR',
7 ], 7 ],
8 'conditions' : [ 8 'conditions' : [
9 [ 'skia_gpu == 1', 9 [ 'skia_gpu == 1',
10 { 10 {
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 'VCLinkerTool': { 69 'VCLinkerTool': {
70 'GenerateDebugInformation': 'true', # /DEBUG 70 'GenerateDebugInformation': 'true', # /DEBUG
71 'LinkIncremental': '2', # /INCREMENTAL 71 'LinkIncremental': '2', # /INCREMENTAL
72 }, 72 },
73 }, 73 },
74 }, 74 },
75 'Release': { 75 'Release': {
76 'msvs_settings': { 76 'msvs_settings': {
77 'VCCLCompilerTool': { 77 'VCCLCompilerTool': {
78 'DebugInformationFormat': '3', # programDatabase (/Zi) 78 'DebugInformationFormat': '3', # programDatabase (/Zi)
79 'Optimization': '3', # full (/Ox) 79 'Optimization': '<(skia_release_optimization_level)',
80 'WholeProgramOptimization': 'true', #/GL 80 'WholeProgramOptimization': 'true', #/GL
81 # Changing the floating point model requires rebaseling gm images 81 # Changing the floating point model requires rebaseling gm images
82 #'FloatingPointModel': '2', # fast (/fp:fast) 82 #'FloatingPointModel': '2', # fast (/fp:fast)
83 'FavorSizeOrSpeed': '1', # speed (/Ot) 83 'FavorSizeOrSpeed': '1', # speed (/Ot)
84 'PreprocessorDefinitions': ['NDEBUG'], 84 'PreprocessorDefinitions': ['NDEBUG'],
85 'RuntimeLibrary': '2', # rtMultiThreadedDLL (/MD) 85 'RuntimeLibrary': '2', # rtMultiThreadedDLL (/MD)
86 'EnableEnhancedInstructionSet': '2',# /arch:SSE2 86 'EnableEnhancedInstructionSet': '2',# /arch:SSE2
87 'RuntimeTypeInfo': 'false', # /GR- 87 'RuntimeTypeInfo': 'false', # /GR-
88 }, 88 },
89 'VCLinkerTool': { 89 'VCLinkerTool': {
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 { 130 {
131 'defines': [ 131 'defines': [
132 'SK_SAMPLES_FOR_X', 132 'SK_SAMPLES_FOR_X',
133 'SK_BUILD_FOR_UNIX', 133 'SK_BUILD_FOR_UNIX',
134 ], 134 ],
135 'configurations': { 135 'configurations': {
136 'Debug': { 136 'Debug': {
137 'cflags': ['-g'] 137 'cflags': ['-g']
138 }, 138 },
139 'Release': { 139 'Release': {
140 'cflags': ['-O3 -g'], 140 'cflags': [
141 '-O<(skia_release_optimization_level)',
142 '-g',
143 ],
141 'defines': [ 'NDEBUG' ], 144 'defines': [ 'NDEBUG' ],
142 }, 145 },
143 }, 146 },
144 'cflags': [ 147 'cflags': [
145 '-Wall', 148 '-Wall',
146 '-Wextra', 149 '-Wextra',
147 # suppressions below here were added for clang 150 # suppressions below here were added for clang
148 '-Wno-unused-parameter', 151 '-Wno-unused-parameter',
149 '-Wno-c++11-extensions' 152 '-Wno-c++11-extensions'
150 ], 153 ],
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 }], 231 }],
229 ], 232 ],
230 'configurations': { 233 'configurations': {
231 'Debug': { 234 'Debug': {
232 'xcode_settings': { 235 'xcode_settings': {
233 'GCC_OPTIMIZATION_LEVEL': '0', 236 'GCC_OPTIMIZATION_LEVEL': '0',
234 }, 237 },
235 }, 238 },
236 'Release': { 239 'Release': {
237 'xcode_settings': { 240 'xcode_settings': {
238 'GCC_OPTIMIZATION_LEVEL': '3', 241 'GCC_OPTIMIZATION_LEVEL': '<(skia_release_optimization_level)',
239 }, 242 },
240 'defines': [ 'NDEBUG' ], 243 'defines': [ 'NDEBUG' ],
241 }, 244 },
242 }, 245 },
243 'xcode_settings': { 246 'xcode_settings': {
244 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', 247 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
245 'conditions': [ 248 'conditions': [
246 [ 'skia_osx_sdkroot==""', { 249 [ 'skia_osx_sdkroot==""', {
247 'SDKROOT': 'macosx<(mac_sdk)', # -isysroot 250 'SDKROOT': 'macosx<(mac_sdk)', # -isysroot
248 }, { 251 }, {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 }], 297 }],
295 ], 298 ],
296 'configurations': { 299 'configurations': {
297 'Debug': { 300 'Debug': {
298 'xcode_settings': { 301 'xcode_settings': {
299 'GCC_OPTIMIZATION_LEVEL': '0', 302 'GCC_OPTIMIZATION_LEVEL': '0',
300 }, 303 },
301 }, 304 },
302 'Release': { 305 'Release': {
303 'xcode_settings': { 306 'xcode_settings': {
304 'GCC_OPTIMIZATION_LEVEL': '3', 307 'GCC_OPTIMIZATION_LEVEL': '<(skia_release_optimization_level)',
305 }, 308 },
306 'defines': [ 'NDEBUG' ], 309 'defines': [ 'NDEBUG' ],
307 }, 310 },
308 }, 311 },
309 'xcode_settings': { 312 'xcode_settings': {
310 'ARCHS': ['armv6', 'armv7'], 313 'ARCHS': ['armv6', 'armv7'],
311 'CODE_SIGNING_REQUIRED': 'NO', 314 'CODE_SIGNING_REQUIRED': 'NO',
312 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '', 315 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '',
313 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)', 316 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)',
314 'SDKROOT': 'iphoneos', 317 'SDKROOT': 'iphoneos',
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 'xcode_settings': { 425 'xcode_settings': {
423 'SYMROOT': '<(DEPTH)/xcodebuild', 426 'SYMROOT': '<(DEPTH)/xcodebuild',
424 }, 427 },
425 } 428 }
426 429
427 # Local Variables: 430 # Local Variables:
428 # tab-width:2 431 # tab-width:2
429 # indent-tabs-mode:nil 432 # indent-tabs-mode:nil
430 # End: 433 # End:
431 # vim: set expandtab tabstop=2 shiftwidth=2: 434 # vim: set expandtab tabstop=2 shiftwidth=2:
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