Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(66)

Side by Side Diff: build/internal/essential.scons

Issue 17021: Revert sdk 6.1 upgrade changes. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « build/SConscript.main ('k') | build/internal/essential.vsprops » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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_6_1/Include', 49 '$PLATFORMSDK_VISTA/Include',
50 '$PLATFORMSDK_VISTA/VC/INCLUDE',
50 '$VISUAL_STUDIO/VC/atlmfc/include', 51 '$VISUAL_STUDIO/VC/atlmfc/include',
51 ], 52 ],
52 CCFLAGS = [ 53 CCFLAGS = [
53 '/GR-', # VCCLCompilerTool.RuntimeTypeInfo="false" 54 '/GR-', # VCCLCompilerTool.RuntimeTypeInfo="false"
54 '/Gs', # VCCLCompilerTool.BufferSecurityCheck="true" 55 '/Gs', # VCCLCompilerTool.BufferSecurityCheck="true"
55 '/Gy', # VCCLCompilerTool.EnableFunctionLevelLinking="true" 56 '/Gy', # VCCLCompilerTool.EnableFunctionLevelLinking="true"
56 '/W3', # VCCLCompilerTool.WarningLevel="3" 57 '/W3', # VCCLCompilerTool.WarningLevel="3"
57 58
58 # TODO(sgk): re-enable this 59 # TODO(sgk): re-enable this
59 #'/WX', # WarnAsError="true" 60 #'/WX', # WarnAsError="true"
60 61
61 # 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),
62 # VCCLComilerTool.DebugInformationFormat="3". 63 # VCCLComilerTool.DebugInformationFormat="3".
63 # 64 #
64 # /Zi ends up with multiple compiler invocations trying to updat 65 # /Zi ends up with multiple compiler invocations trying to updat
65 # 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
66 # and permission problems. We're using /Z7 because it makes things 67 # and permission problems. We're using /Z7 because it makes things
67 # work even in parallel builds, without special config to avoid 68 # work even in parallel builds, without special config to avoid
68 # multiple simultaneous updates the vc80.pdb file. All the 69 # multiple simultaneous updates the vc80.pdb file. All the
69 # debugging information and capability still end up in the 70 # debugging information and capability still end up in the
70 # executables. 71 # executables.
71 '/Z7', # VCCLCompilerTool.DebugInformationFormat="1" 72 '/Z7', # VCCLCompilerTool.DebugInformationFormat="1"
72 73
73 # VCCLCompilerTool.DisableSpecificWarnings="4503; 4819" 74 # VCCLCompilerTool.DisableSpecificWarnings="4503; 4819"
74 '/wd4503', 75 '/wd4503',
75 '/wd4819', 76 '/wd4819',
76 ], 77 ],
77 LIBPATH = [ 78 LIBPATH = [
78 '$PLATFORMSDK_6_1/Lib', 79 '$PLATFORMSDK_VISTA/Lib',
80 '$PLATFORMSDK_VISTA/VC/LIB',
79 '$VISUAL_STUDIO/VC/atlmfc/lib', 81 '$VISUAL_STUDIO/VC/atlmfc/lib',
80 ], 82 ],
81 LIBS = [ 83 LIBS = [
82 'msimg32', 84 'msimg32',
83 'psapi', 85 'psapi',
84 'usp10.lib', 86 'usp10.lib',
85 'version', 87 'version',
86 'wininet', 88 'wininet',
87 'ws2_32', 89 'ws2_32',
88 ], 90 ],
(...skipping 16 matching lines...) Expand all
105 env.FilterOut( 107 env.FilterOut(
106 CCFLAGS = [ 108 CCFLAGS = [
107 '/GM', # VCCLCompilerTool.MinimalRebuild="false" 109 '/GM', # VCCLCompilerTool.MinimalRebuild="false"
108 '/EH', # VCCLCompilerTool.ExceptionHandling="0" 110 '/EH', # VCCLCompilerTool.ExceptionHandling="0"
109 ], 111 ],
110 ) 112 )
111 elif env.Bit('linux'): 113 elif env.Bit('linux'):
112 pass 114 pass
113 elif env.Bit('mac'): 115 elif env.Bit('mac'):
114 pass 116 pass
OLDNEW
« no previous file with comments | « build/SConscript.main ('k') | build/internal/essential.vsprops » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698