| OLD | NEW | 
|     1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. |     1 # Copyright (c) 2011 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 740 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   751           [ 'OS=="win"', { |   751           [ 'OS=="win"', { | 
|   752             'defines': [ |   752             'defines': [ | 
|   753               '_CRT_SECURE_NO_DEPRECATE', |   753               '_CRT_SECURE_NO_DEPRECATE', | 
|   754               '_CRT_NONSTDC_NO_WARNINGS', |   754               '_CRT_NONSTDC_NO_WARNINGS', | 
|   755               '_CRT_NONSTDC_NO_DEPRECATE', |   755               '_CRT_NONSTDC_NO_DEPRECATE', | 
|   756               '_SCL_SECURE_NO_DEPRECATE', |   756               '_SCL_SECURE_NO_DEPRECATE', | 
|   757             ], |   757             ], | 
|   758             'msvs_disabled_warnings': [4800], |   758             'msvs_disabled_warnings': [4800], | 
|   759             'msvs_settings': { |   759             'msvs_settings': { | 
|   760               'VCCLCompilerTool': { |   760               'VCCLCompilerTool': { | 
|   761                 'WarnAsError': 'false', |   761                 'WarningLevel': '3', | 
 |   762                 'WarnAsError': 'false', # TODO(maruel): Enable it. | 
|   762                 'Detect64BitPortabilityProblems': 'false', |   763                 'Detect64BitPortabilityProblems': 'false', | 
|   763               }, |   764               }, | 
|   764             }, |   765             }, | 
|   765           }], |   766           }], | 
|   766           [ 'OS=="mac"', { |   767           [ 'OS=="mac"', { | 
|   767             'xcode_settings': { |   768             'xcode_settings': { | 
|   768               'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', |   769               'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', | 
|   769               'WARNING_CFLAGS!': ['-Wall', '-Wextra'], |   770               'WARNING_CFLAGS!': ['-Wall', '-Wextra'], | 
|   770             }, |   771             }, | 
|   771           }], |   772           }], | 
| (...skipping 741 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1513               '_SECURE_ATL', |  1514               '_SECURE_ATL', | 
|  1514             ], |  1515             ], | 
|  1515           }], |  1516           }], | 
|  1516         ], |  1517         ], | 
|  1517         'msvs_system_include_dirs': [ |  1518         'msvs_system_include_dirs': [ | 
|  1518           '<(DEPTH)/third_party/platformsdk_win7/files/Include', |  1519           '<(DEPTH)/third_party/platformsdk_win7/files/Include', | 
|  1519           '<(DEPTH)/third_party/directxsdk/files/Include', |  1520           '<(DEPTH)/third_party/directxsdk/files/Include', | 
|  1520           '$(VSInstallDir)/VC/atlmfc/include', |  1521           '$(VSInstallDir)/VC/atlmfc/include', | 
|  1521         ], |  1522         ], | 
|  1522         'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'], |  1523         'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'], | 
|  1523         'msvs_disabled_warnings': [4351, 4396, 4503, 4819], |  1524         'msvs_disabled_warnings': [4351, 4396, 4503, 4819, | 
 |  1525           # TODO(maruel): These warnings are level 4. They will be slowly | 
 |  1526           # removed as code is fixed. | 
 |  1527           4100, 4121, 4125, 4127, 4130, 4131, 4189, 4201, 4238, 4244, 4245, | 
 |  1528           4310, 4355, 4428, 4481, 4505, 4510, 4512, 4530, 4610, 4611, 4701, | 
 |  1529           4702, 4706, | 
 |  1530         ], | 
|  1524         'msvs_settings': { |  1531         'msvs_settings': { | 
|  1525           'VCCLCompilerTool': { |  1532           'VCCLCompilerTool': { | 
|  1526             'MinimalRebuild': 'false', |  1533             'MinimalRebuild': 'false', | 
|  1527             'BufferSecurityCheck': 'true', |  1534             'BufferSecurityCheck': 'true', | 
|  1528             'EnableFunctionLevelLinking': 'true', |  1535             'EnableFunctionLevelLinking': 'true', | 
|  1529             'RuntimeTypeInfo': 'false', |  1536             'RuntimeTypeInfo': 'false', | 
|  1530             'WarningLevel': '3', |  1537             'WarningLevel': '4', | 
|  1531             'WarnAsError': 'true', |  1538             'WarnAsError': 'true', | 
|  1532             'DebugInformationFormat': '3', |  1539             'DebugInformationFormat': '3', | 
|  1533             'conditions': [ |  1540             'conditions': [ | 
|  1534               ['msvs_multi_core_compile', { |  1541               ['msvs_multi_core_compile', { | 
|  1535                 'AdditionalOptions': ['/MP'], |  1542                 'AdditionalOptions': ['/MP'], | 
|  1536               }], |  1543               }], | 
|  1537               ['MSVS_VERSION=="2005e"', { |  1544               ['MSVS_VERSION=="2005e"', { | 
|  1538                 'AdditionalOptions': ['/w44068'], # Unknown pragma to 4 (ATL) |  1545                 'AdditionalOptions': ['/w44068'], # Unknown pragma to 4 (ATL) | 
|  1539               }], |  1546               }], | 
|  1540               ['component=="shared_library"', { |  1547               ['component=="shared_library"', { | 
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1699     # and therefore SYMROOT, needs to be set at the project level. |  1706     # and therefore SYMROOT, needs to be set at the project level. | 
|  1700     'SYMROOT': '<(DEPTH)/xcodebuild', |  1707     'SYMROOT': '<(DEPTH)/xcodebuild', | 
|  1701   }, |  1708   }, | 
|  1702 } |  1709 } | 
|  1703  |  1710  | 
|  1704 # Local Variables: |  1711 # Local Variables: | 
|  1705 # tab-width:2 |  1712 # tab-width:2 | 
|  1706 # indent-tabs-mode:nil |  1713 # indent-tabs-mode:nil | 
|  1707 # End: |  1714 # End: | 
|  1708 # vim: set expandtab tabstop=2 shiftwidth=2: |  1715 # vim: set expandtab tabstop=2 shiftwidth=2: | 
| OLD | NEW |