| OLD | NEW |
| 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 # .gyp files should set chromium_code to 1 if they build Chromium-specific | 7 # .gyp files should set chromium_code to 1 if they build Chromium-specific |
| 8 # code, as opposed to external code. This variable is used to control | 8 # code, as opposed to external code. This variable is used to control |
| 9 # such things as the set of warnings to enable, and whether warnings are | 9 # such things as the set of warnings to enable, and whether warnings are |
| 10 # treated as errors. | 10 # treated as errors. |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 ['MSVS_OS_BITS==32', { | 153 ['MSVS_OS_BITS==32', { |
| 154 'msvs_large_module_debug_link_mode%': '1', # No | 154 'msvs_large_module_debug_link_mode%': '1', # No |
| 155 },{ | 155 },{ |
| 156 'msvs_large_module_debug_link_mode%': '2', # Yes | 156 'msvs_large_module_debug_link_mode%': '2', # Yes |
| 157 }], | 157 }], |
| 158 ], | 158 ], |
| 159 }], | 159 }], |
| 160 ], | 160 ], |
| 161 }, | 161 }, |
| 162 'target_defaults': { | 162 'target_defaults': { |
| 163 'variables': { |
| 164 'mac_release_optimization%': '2' # Use -O2 unless overridden |
| 165 }, |
| 163 'conditions': [ | 166 'conditions': [ |
| 164 ['branding=="Chrome"', { | 167 ['branding=="Chrome"', { |
| 165 'defines': ['GOOGLE_CHROME_BUILD'], | 168 'defines': ['GOOGLE_CHROME_BUILD'], |
| 166 'conditions': [ | 169 'conditions': [ |
| 167 ['OS=="linux"', { | 170 ['OS=="linux"', { |
| 168 'cflags': [ '-gstabs' ], | 171 'cflags': [ '-gstabs' ], |
| 169 }], | 172 }], |
| 170 ], | 173 ], |
| 171 }, { # else: branding!="Chrome" | 174 }, { # else: branding!="Chrome" |
| 172 'defines': ['CHROMIUM_BUILD'], | 175 'defines': ['CHROMIUM_BUILD'], |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 }], # coverage!=0 | 220 }], # coverage!=0 |
| 218 ], # conditions for 'target_defaults' | 221 ], # conditions for 'target_defaults' |
| 219 'default_configuration': 'Debug', | 222 'default_configuration': 'Debug', |
| 220 'configurations': { | 223 'configurations': { |
| 221 # VCLinkerTool LinkIncremental values below: | 224 # VCLinkerTool LinkIncremental values below: |
| 222 # 0 == default | 225 # 0 == default |
| 223 # 1 == /INCREMENTAL:NO | 226 # 1 == /INCREMENTAL:NO |
| 224 # 2 == /INCREMENTAL | 227 # 2 == /INCREMENTAL |
| 225 # Debug links incremental, Release does not. | 228 # Debug links incremental, Release does not. |
| 226 'Debug': { | 229 'Debug': { |
| 230 'xcode_settings': { |
| 231 'COPY_PHASE_STRIP': 'NO', |
| 232 'GCC_OPTIMIZATION_LEVEL': '0', # -O0 |
| 233 }, |
| 227 'conditions': [ | 234 'conditions': [ |
| 228 [ 'OS=="mac"', { | |
| 229 'xcode_settings': { | |
| 230 'COPY_PHASE_STRIP': 'NO', | |
| 231 'GCC_OPTIMIZATION_LEVEL': '0', # -O0 | |
| 232 } | |
| 233 }], | |
| 234 [ 'OS=="win"', { | 235 [ 'OS=="win"', { |
| 235 'configuration_platform': 'Win32', | 236 'configuration_platform': 'Win32', |
| 236 'msvs_configuration_attributes': { | 237 'msvs_configuration_attributes': { |
| 237 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)', | 238 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)', |
| 238 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', | 239 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', |
| 239 'CharacterSet': '1', | 240 'CharacterSet': '1', |
| 240 }, | 241 }, |
| 241 'msvs_settings': { | 242 'msvs_settings': { |
| 242 'VCCLCompilerTool': { | 243 'VCCLCompilerTool': { |
| 243 'Optimization': '0', | 244 'Optimization': '0', |
| 244 'PreprocessorDefinitions': ['_DEBUG'], | 245 'PreprocessorDefinitions': ['_DEBUG'], |
| 245 'BasicRuntimeChecks': '3', | 246 'BasicRuntimeChecks': '3', |
| 246 'RuntimeLibrary': '1', | 247 'RuntimeLibrary': '1', |
| 247 }, | 248 }, |
| 248 'VCLinkerTool': { | 249 'VCLinkerTool': { |
| 249 'LinkIncremental': '<(msvs_debug_link_incremental)', | 250 'LinkIncremental': '<(msvs_debug_link_incremental)', |
| 250 }, | 251 }, |
| 251 'VCResourceCompilerTool': { | 252 'VCResourceCompilerTool': { |
| 252 'PreprocessorDefinitions': ['_DEBUG'], | 253 'PreprocessorDefinitions': ['_DEBUG'], |
| 253 }, | 254 }, |
| 254 }, | 255 }, |
| 255 }], | 256 }], |
| 256 ], | 257 ], |
| 257 }, | 258 }, |
| 258 'Release': { | 259 'Release': { |
| 259 'defines': [ | 260 'defines': [ |
| 260 'NDEBUG', | 261 'NDEBUG', |
| 261 ], | 262 ], |
| 263 'xcode_settings': { |
| 264 'DEAD_CODE_STRIPPING': 'YES', # -Wl,-dead_strip |
| 265 'GCC_OPTIMIZATION_LEVEL': '<(mac_release_optimization)', |
| 266 }, |
| 262 'conditions': [ | 267 'conditions': [ |
| 263 [ 'OS=="mac"', { | |
| 264 'xcode_settings': { | |
| 265 'DEAD_CODE_STRIPPING': 'YES', # -Wl,-dead_strip | |
| 266 'conditions': [ | |
| 267 ['mac_release_optimization != "UNSET"', | |
| 268 {'GCC_OPTIMIZATION_LEVEL': '<(mac_release_optimization)'}], | |
| 269 ], | |
| 270 } | |
| 271 }], | |
| 272 [ 'OS=="win" and msvs_use_common_release', { | 268 [ 'OS=="win" and msvs_use_common_release', { |
| 273 'configuration_platform': 'Win32', | 269 'configuration_platform': 'Win32', |
| 274 'msvs_props': ['release.vsprops'], | 270 'msvs_props': ['release.vsprops'], |
| 275 }], | 271 }], |
| 276 [ 'OS=="win"', { | 272 [ 'OS=="win"', { |
| 277 'msvs_configuration_attributes': { | 273 'msvs_configuration_attributes': { |
| 278 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)', | 274 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)', |
| 279 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', | 275 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', |
| 280 'CharacterSet': '1', | 276 'CharacterSet': '1', |
| 281 }, | 277 }, |
| (...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 546 ], | 542 ], |
| 547 }, | 543 }, |
| 548 }], | 544 }], |
| 549 ['OS=="mac"', { | 545 ['OS=="mac"', { |
| 550 'target_defaults': { | 546 'target_defaults': { |
| 551 'variables': { | 547 'variables': { |
| 552 # This should be 'mac_real_dsym%', but there seems to be a bug | 548 # This should be 'mac_real_dsym%', but there seems to be a bug |
| 553 # with % in variables that are intended to be set to different | 549 # with % in variables that are intended to be set to different |
| 554 # values in different targets, like this one. | 550 # values in different targets, like this one. |
| 555 'mac_real_dsym': 0, # Fake .dSYMs are fine in most cases. | 551 'mac_real_dsym': 0, # Fake .dSYMs are fine in most cases. |
| 556 # Release defaults to the Xcode optimization default, this var | |
| 557 # lets you force the value. | |
| 558 'mac_release_optimization%': 'UNSET' | |
| 559 }, | 552 }, |
| 560 'mac_bundle': 0, | 553 'mac_bundle': 0, |
| 561 'xcode_settings': { | 554 'xcode_settings': { |
| 562 'ALWAYS_SEARCH_USER_PATHS': 'NO', | 555 'ALWAYS_SEARCH_USER_PATHS': 'NO', |
| 563 'GCC_C_LANGUAGE_STANDARD': 'c99', # -std=c99 | 556 'GCC_C_LANGUAGE_STANDARD': 'c99', # -std=c99 |
| 564 'GCC_CW_ASM_SYNTAX': 'NO', # No -fasm-blocks | 557 'GCC_CW_ASM_SYNTAX': 'NO', # No -fasm-blocks |
| 565 'GCC_DYNAMIC_NO_PIC': 'NO', # No -mdynamic-no-pic | 558 'GCC_DYNAMIC_NO_PIC': 'NO', # No -mdynamic-no-pic |
| 566 # (Equivalent to -fPIC) | 559 # (Equivalent to -fPIC) |
| 567 'GCC_ENABLE_CPP_EXCEPTIONS': 'NO', # -fno-exceptions | 560 'GCC_ENABLE_CPP_EXCEPTIONS': 'NO', # -fno-exceptions |
| 568 'GCC_ENABLE_CPP_RTTI': 'NO', # -fno-rtti | 561 'GCC_ENABLE_CPP_RTTI': 'NO', # -fno-rtti |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 765 # settings in target dicts. SYMROOT is a special case, because many other | 758 # settings in target dicts. SYMROOT is a special case, because many other |
| 766 # Xcode variables depend on it, including variables such as | 759 # Xcode variables depend on it, including variables such as |
| 767 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 760 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 768 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 761 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 769 # files to appear (when present) in the UI as actual files and not red | 762 # files to appear (when present) in the UI as actual files and not red |
| 770 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 763 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 771 # and therefore SYMROOT, needs to be set at the project level. | 764 # and therefore SYMROOT, needs to be set at the project level. |
| 772 'SYMROOT': '<(DEPTH)/xcodebuild', | 765 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 773 }, | 766 }, |
| 774 } | 767 } |
| OLD | NEW |