| OLD | NEW | 
|    1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |    1 # Copyright (c) 2006-2008 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 __doc__ = """ |    5 __doc__ = """ | 
|    6 Essential settings for Chromium builds. |    6 Essential settings for Chromium builds. | 
|    7 """ |    7 """ | 
|    8  |    8  | 
|    9 Import("env") |    9 Import("env") | 
|   10  |   10  | 
|   11 env.Append( |   11 env.Append( | 
|   12     CPPPATH = [ |   12     CPPPATH = [ | 
|   13         '$CHROME_SRC_DIR', |   13         '$CHROME_SRC_DIR', | 
|   14     ], |   14     ], | 
|   15     CCFLAGS = [ |   15     CCFLAGS = [ | 
|   16         '$CHROMIUM_CC_OPT_FLAGS', |   16         '$CHROMIUM_CC_OPT_FLAGS', | 
|   17     ], |   17     ], | 
|   18     LINKFLAGS = [ |   18     LINKFLAGS = [ | 
|   19         '$CHROMIUM_LINK_OPT_FLAGS', |   19         '$CHROMIUM_LINK_OPT_FLAGS', | 
 |   20         '$CHROMIUM_INCREMENTAL_FLAGS', | 
|   20     ], |   21     ], | 
|   21 ) |   22 ) | 
|   22  |   23  | 
|   23 if env['PLATFORM'] == 'win32': |   24 if env['PLATFORM'] == 'win32': | 
 |   25   incremental = env.get('INCREMENTAL') | 
 |   26   if incremental is not None: | 
 |   27     if incremental: | 
 |   28       env['CHROMIUM_INCREMENTAL_FLAGS'] = '/INCREMENTAL' | 
 |   29     else: | 
 |   30       env['CHROMIUM_INCREMENTAL_FLAGS'] = '/INCREMENTAL:NO' | 
|   24   env.Append( |   31   env.Append( | 
|   25       ARFLAGS = [ |   32       ARFLAGS = [ | 
|   26           '/ignore:4221', |   33           '/ignore:4221', | 
|   27       ], |   34       ], | 
|   28       CPPDEFINES = [ |   35       CPPDEFINES = [ | 
|   29           ('_WIN32_WINNT', '0x0600'), |   36           ('_WIN32_WINNT', '0x0600'), | 
|   30           ('WINVER', '0x0600'), |   37           ('WINVER', '0x0600'), | 
|   31           'WIN32', |   38           'WIN32', | 
|   32           '_WINDOWS', |   39           '_WINDOWS', | 
|   33           ('_HAS_EXCEPTIONS', 0), |   40           ('_HAS_EXCEPTIONS', 0), | 
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  100   env.FilterOut( |  107   env.FilterOut( | 
|  101       CCFLAGS = [ |  108       CCFLAGS = [ | 
|  102           '/GM',    # VCCLCompilerTool.MinimalRebuild="false" |  109           '/GM',    # VCCLCompilerTool.MinimalRebuild="false" | 
|  103           '/EH',    # VCCLCompilerTool.ExceptionHandling="0" |  110           '/EH',    # VCCLCompilerTool.ExceptionHandling="0" | 
|  104       ], |  111       ], | 
|  105   ) |  112   ) | 
|  106 elif env['PLATFORM'] == 'posix': |  113 elif env['PLATFORM'] == 'posix': | 
|  107   pass |  114   pass | 
|  108 elif env['PLATFORM'] == 'mac': |  115 elif env['PLATFORM'] == 'mac': | 
|  109   pass |  116   pass | 
| OLD | NEW |