| 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 |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 '_WINDOWS', | 39 '_WINDOWS', |
| 40 ('_HAS_EXCEPTIONS', 0), | 40 ('_HAS_EXCEPTIONS', 0), |
| 41 'NOMINMAX', | 41 'NOMINMAX', |
| 42 '_CRT_RAND_S', | 42 '_CRT_RAND_S', |
| 43 'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS', | 43 'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS', |
| 44 'WIN32_LEAN_AND_MEAN', | 44 'WIN32_LEAN_AND_MEAN', |
| 45 '_SECURE_ATL', | 45 '_SECURE_ATL', |
| 46 ('_HAS_TR1', 0), | 46 ('_HAS_TR1', 0), |
| 47 ], | 47 ], |
| 48 CPPPATH = [ | 48 CPPPATH = [ |
| 49 '$PLATFORMSDK_VISTA/files/Include', | 49 '$PLATFORMSDK_VISTA/Include', |
| 50 '$PLATFORMSDK_VISTA/files/VC/INCLUDE', | 50 '$PLATFORMSDK_VISTA/VC/INCLUDE', |
| 51 '$VISUAL_STUDIO/VC/atlmfc/include', | 51 '$VISUAL_STUDIO/VC/atlmfc/include', |
| 52 ], | 52 ], |
| 53 CCFLAGS = [ | 53 CCFLAGS = [ |
| 54 '/GR-', # VCCLCompilerTool.RuntimeTypeInfo="false" | 54 '/GR-', # VCCLCompilerTool.RuntimeTypeInfo="false" |
| 55 '/Gs', # VCCLCompilerTool.BufferSecurityCheck="true" | 55 '/Gs', # VCCLCompilerTool.BufferSecurityCheck="true" |
| 56 '/Gy', # VCCLCompilerTool.EnableFunctionLevelLinking="true" | 56 '/Gy', # VCCLCompilerTool.EnableFunctionLevelLinking="true" |
| 57 '/W3', # VCCLCompilerTool.WarningLevel="3" | 57 '/W3', # VCCLCompilerTool.WarningLevel="3" |
| 58 | 58 |
| 59 # TODO(sgk): re-enable this | 59 # TODO(sgk): re-enable this |
| 60 #'/WX', # WarnAsError="true" | 60 #'/WX', # WarnAsError="true" |
| 61 | 61 |
| 62 # In the old Visual Studio build, we used /Zi (edit and continue), | 62 # In the old Visual Studio build, we used /Zi (edit and continue), |
| 63 # VCCLComilerTool.DebugInformationFormat="3". | 63 # VCCLComilerTool.DebugInformationFormat="3". |
| 64 # | 64 # |
| 65 # /Zi ends up with multiple compiler invocations trying to updat | 65 # /Zi ends up with multiple compiler invocations trying to updat |
| 66 # the same vc80.pdb file at the same time, with race conditions | 66 # the same vc80.pdb file at the same time, with race conditions |
| 67 # and permission problems. We're using /Z7 because it makes things | 67 # and permission problems. We're using /Z7 because it makes things |
| 68 # work even in parallel builds, without special config to avoid | 68 # work even in parallel builds, without special config to avoid |
| 69 # multiple simultaneous updates the vc80.pdb file. All the | 69 # multiple simultaneous updates the vc80.pdb file. All the |
| 70 # debugging information and capability still end up in the | 70 # debugging information and capability still end up in the |
| 71 # executables. | 71 # executables. |
| 72 '/Z7', # VCCLCompilerTool.DebugInformationFormat="1" | 72 '/Z7', # VCCLCompilerTool.DebugInformationFormat="1" |
| 73 | 73 |
| 74 # VCCLCompilerTool.DisableSpecificWarnings="4503; 4819" | 74 # VCCLCompilerTool.DisableSpecificWarnings="4503; 4819" |
| 75 '/wd4503', | 75 '/wd4503', |
| 76 '/wd4819', | 76 '/wd4819', |
| 77 ], | 77 ], |
| 78 LIBPATH = [ | 78 LIBPATH = [ |
| 79 '$PLATFORMSDK_VISTA/files/Lib', | 79 '$PLATFORMSDK_VISTA/Lib', |
| 80 '$PLATFORMSDK_VISTA/files/VC/LIB', | 80 '$PLATFORMSDK_VISTA/VC/LIB', |
| 81 '$VISUAL_STUDIO/VC/atlmfc/lib', | 81 '$VISUAL_STUDIO/VC/atlmfc/lib', |
| 82 ], | 82 ], |
| 83 LIBS = [ | 83 LIBS = [ |
| 84 'msimg32', | 84 'msimg32', |
| 85 'psapi', | 85 'psapi', |
| 86 'usp10.lib', | 86 'usp10.lib', |
| 87 'version', | 87 'version', |
| 88 'wininet', | 88 'wininet', |
| 89 'ws2_32', | 89 'ws2_32', |
| 90 ], | 90 ], |
| (...skipping 16 matching lines...) Expand all Loading... |
| 107 env.FilterOut( | 107 env.FilterOut( |
| 108 CCFLAGS = [ | 108 CCFLAGS = [ |
| 109 '/GM', # VCCLCompilerTool.MinimalRebuild="false" | 109 '/GM', # VCCLCompilerTool.MinimalRebuild="false" |
| 110 '/EH', # VCCLCompilerTool.ExceptionHandling="0" | 110 '/EH', # VCCLCompilerTool.ExceptionHandling="0" |
| 111 ], | 111 ], |
| 112 ) | 112 ) |
| 113 elif env['PLATFORM'] == 'posix': | 113 elif env['PLATFORM'] == 'posix': |
| 114 pass | 114 pass |
| 115 elif env['PLATFORM'] == 'mac': | 115 elif env['PLATFORM'] == 'mac': |
| 116 pass | 116 pass |
| OLD | NEW |