| OLD | NEW | 
|     1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |     1 # Copyright (c) 2012 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 # IMPORTANT: |     5 # IMPORTANT: | 
|     6 # Please don't directly include this file if you are building via gyp_chromium, |     6 # Please don't directly include this file if you are building via gyp_chromium, | 
|     7 # since gyp_chromium is automatically forcing its inclusion. |     7 # since gyp_chromium is automatically forcing its inclusion. | 
|     8 { |     8 { | 
|     9   # Variables expected to be overriden on the GYP command line (-D) or by |     9   # Variables expected to be overriden on the GYP command line (-D) or by | 
|    10   # ~/.gyp/include.gypi. |    10   # ~/.gyp/include.gypi. | 
| (...skipping 5098 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  5109           '_WIN32_WINNT=0x0602', |  5109           '_WIN32_WINNT=0x0602', | 
|  5110           'WINVER=0x0602', |  5110           'WINVER=0x0602', | 
|  5111           'WIN32', |  5111           'WIN32', | 
|  5112           '_WINDOWS', |  5112           '_WINDOWS', | 
|  5113           'NOMINMAX', |  5113           'NOMINMAX', | 
|  5114           'PSAPI_VERSION=1', |  5114           'PSAPI_VERSION=1', | 
|  5115           '_CRT_RAND_S', |  5115           '_CRT_RAND_S', | 
|  5116           'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS', |  5116           'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS', | 
|  5117           'WIN32_LEAN_AND_MEAN', |  5117           'WIN32_LEAN_AND_MEAN', | 
|  5118           '_ATL_NO_OPENGL', |  5118           '_ATL_NO_OPENGL', | 
|  5119           # _HAS_EXCEPTIONS must match ExceptionHandling in msvs_settings. |  | 
|  5120           '_HAS_EXCEPTIONS=0', |  | 
|  5121         ], |  5119         ], | 
|  5122         'conditions': [ |  5120         'conditions': [ | 
|  5123           ['buildtype=="Official"', { |  5121           ['buildtype=="Official"', { | 
|  5124               # In official builds, targets can self-select an optimization |  5122               # In official builds, targets can self-select an optimization | 
|  5125               # level by defining a variable named 'optimize', and setting it |  5123               # level by defining a variable named 'optimize', and setting it | 
|  5126               # to one of |  5124               # to one of | 
|  5127               # - "size", optimizes for minimal code size - the default. |  5125               # - "size", optimizes for minimal code size - the default. | 
|  5128               # - "speed", optimizes for speed over code size. |  5126               # - "speed", optimizes for speed over code size. | 
|  5129               # - "max", whole program optimization and link-time code |  5127               # - "max", whole program optimization and link-time code | 
|  5130               #   generation. This is very expensive and should be used |  5128               #   generation. This is very expensive and should be used | 
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  5178                         'FavorSizeOrSpeed': '1', |  5176                         'FavorSizeOrSpeed': '1', | 
|  5179                         # This implies link time code generation. |  5177                         # This implies link time code generation. | 
|  5180                         'WholeProgramOptimization': 'true', |  5178                         'WholeProgramOptimization': 'true', | 
|  5181                       }, |  5179                       }, | 
|  5182                     }, |  5180                     }, | 
|  5183                   }, |  5181                   }, | 
|  5184                 ], |  5182                 ], | 
|  5185               ], |  5183               ], | 
|  5186             }, |  5184             }, | 
|  5187           ], |  5185           ], | 
 |  5186           ['component=="static_library"', { | 
 |  5187             'defines': [ | 
 |  5188               '_HAS_EXCEPTIONS=0', | 
 |  5189             ], | 
 |  5190           }], | 
|  5188           ['secure_atl', { |  5191           ['secure_atl', { | 
|  5189             'defines': [ |  5192             'defines': [ | 
|  5190               '_SECURE_ATL', |  5193               '_SECURE_ATL', | 
|  5191             ], |  5194             ], | 
|  5192           }], |  5195           }], | 
|  5193           ['msvs_express', { |  5196           ['msvs_express', { | 
|  5194             'configurations': { |  5197             'configurations': { | 
|  5195               'x86_Base': { |  5198               'x86_Base': { | 
|  5196                 'msvs_settings': { |  5199                 'msvs_settings': { | 
|  5197                   'VCLinkerTool': { |  5200                   'VCLinkerTool': { | 
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  5260         'msvs_settings': { |  5263         'msvs_settings': { | 
|  5261           'VCCLCompilerTool': { |  5264           'VCCLCompilerTool': { | 
|  5262             'AdditionalOptions': ['/MP'], |  5265             'AdditionalOptions': ['/MP'], | 
|  5263             'MinimalRebuild': 'false', |  5266             'MinimalRebuild': 'false', | 
|  5264             'BufferSecurityCheck': 'true', |  5267             'BufferSecurityCheck': 'true', | 
|  5265             'EnableFunctionLevelLinking': 'true', |  5268             'EnableFunctionLevelLinking': 'true', | 
|  5266             'RuntimeTypeInfo': 'false', |  5269             'RuntimeTypeInfo': 'false', | 
|  5267             'WarningLevel': '4', |  5270             'WarningLevel': '4', | 
|  5268             'WarnAsError': 'true', |  5271             'WarnAsError': 'true', | 
|  5269             'DebugInformationFormat': '3', |  5272             'DebugInformationFormat': '3', | 
|  5270             # ExceptionHandling must match _HAS_EXCEPTIONS above. |  5273             'conditions': [ | 
|  5271             'ExceptionHandling': '0', |  5274               ['component=="shared_library"', { | 
 |  5275                 'ExceptionHandling': '1',  # /EHsc | 
 |  5276               }, { | 
 |  5277                 'ExceptionHandling': '0', | 
 |  5278               }], | 
 |  5279             ], | 
|  5272           }, |  5280           }, | 
|  5273           'VCLibrarianTool': { |  5281           'VCLibrarianTool': { | 
|  5274             'AdditionalOptions': ['/ignore:4221'], |  5282             'AdditionalOptions': ['/ignore:4221'], | 
|  5275             'AdditionalLibraryDirectories': [ |  5283             'AdditionalLibraryDirectories': [ | 
|  5276               '<(windows_sdk_path)/Lib/win8/um/x86', |  5284               '<(windows_sdk_path)/Lib/win8/um/x86', | 
|  5277             ], |  5285             ], | 
|  5278           }, |  5286           }, | 
|  5279           'VCLinkerTool': { |  5287           'VCLinkerTool': { | 
|  5280             'AdditionalDependencies': [ |  5288             'AdditionalDependencies': [ | 
|  5281               'wininet.lib', |  5289               'wininet.lib', | 
| (...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  5622     # settings in target dicts.  SYMROOT is a special case, because many other |  5630     # settings in target dicts.  SYMROOT is a special case, because many other | 
|  5623     # Xcode variables depend on it, including variables such as |  5631     # Xcode variables depend on it, including variables such as | 
|  5624     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something |  5632     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
|  5625     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |  5633     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
|  5626     # files to appear (when present) in the UI as actual files and not red |  5634     # files to appear (when present) in the UI as actual files and not red | 
|  5627     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |  5635     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
|  5628     # and therefore SYMROOT, needs to be set at the project level. |  5636     # and therefore SYMROOT, needs to be set at the project level. | 
|  5629     'SYMROOT': '<(DEPTH)/xcodebuild', |  5637     'SYMROOT': '<(DEPTH)/xcodebuild', | 
|  5630   }, |  5638   }, | 
|  5631 } |  5639 } | 
| OLD | NEW |