Chromium Code Reviews| Index: gyp/common_conditions.gypi |
| =================================================================== |
| --- gyp/common_conditions.gypi (revision 9698) |
| +++ gyp/common_conditions.gypi (working copy) |
| @@ -76,7 +76,7 @@ |
| 'msvs_settings': { |
| 'VCCLCompilerTool': { |
| 'DebugInformationFormat': '3', # programDatabase (/Zi) |
| - 'Optimization': '3', # full (/Ox) |
| + 'Optimization': '<(skia_release_optimization_level)', # full (/Ox) |
|
epoger
2013/06/20 18:25:55
please delete the comment, which pertains to the v
bungeman-skia
2013/06/20 19:19:35
gcc uses 0 (none), 1 (basic, local), 2 (everything
|
| 'WholeProgramOptimization': 'true', #/GL |
| # Changing the floating point model requires rebaseling gm images |
| #'FloatingPointModel': '2', # fast (/fp:fast) |
| @@ -137,7 +137,10 @@ |
| 'cflags': ['-g'] |
| }, |
| 'Release': { |
| - 'cflags': ['-O3 -g'], |
|
bungeman-skia
2013/06/20 19:19:35
Huh, I thought the last time we mucked with this w
|
| + 'cflags': [ |
| + '-O<(skia_release_optimization_level)', |
| + '-g' |
| + ], |
| 'defines': [ 'NDEBUG' ], |
| }, |
| }, |
| @@ -235,7 +238,7 @@ |
| }, |
| 'Release': { |
| 'xcode_settings': { |
| - 'GCC_OPTIMIZATION_LEVEL': '3', |
| + 'GCC_OPTIMIZATION_LEVEL': '<(skia_release_optimization_level)', |
| }, |
| 'defines': [ 'NDEBUG' ], |
| }, |
| @@ -301,7 +304,7 @@ |
| }, |
| 'Release': { |
| 'xcode_settings': { |
| - 'GCC_OPTIMIZATION_LEVEL': '3', |
| + 'GCC_OPTIMIZATION_LEVEL': '<(skia_release_optimization_level)', |
| }, |
| 'defines': [ 'NDEBUG' ], |
| }, |