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

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

Issue 14908: Change build-related files to use Windows SDK 6.1 instead of Windows SDK 6.0.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years 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_VISTA/Include', 49 '$PLATFORMSDK_6_1/Include',
50 '$PLATFORMSDK_VISTA/VC/INCLUDE',
51 '$VISUAL_STUDIO/VC/atlmfc/include', 50 '$VISUAL_STUDIO/VC/atlmfc/include',
52 ], 51 ],
53 CCFLAGS = [ 52 CCFLAGS = [
54 '/GR-', # VCCLCompilerTool.RuntimeTypeInfo="false" 53 '/GR-', # VCCLCompilerTool.RuntimeTypeInfo="false"
55 '/Gs', # VCCLCompilerTool.BufferSecurityCheck="true" 54 '/Gs', # VCCLCompilerTool.BufferSecurityCheck="true"
56 '/Gy', # VCCLCompilerTool.EnableFunctionLevelLinking="true" 55 '/Gy', # VCCLCompilerTool.EnableFunctionLevelLinking="true"
57 '/W3', # VCCLCompilerTool.WarningLevel="3" 56 '/W3', # VCCLCompilerTool.WarningLevel="3"
58 57
59 # TODO(sgk): re-enable this 58 # TODO(sgk): re-enable this
60 #'/WX', # WarnAsError="true" 59 #'/WX', # WarnAsError="true"
61 60
62 # In the old Visual Studio build, we used /Zi (edit and continue), 61 # In the old Visual Studio build, we used /Zi (edit and continue),
63 # VCCLComilerTool.DebugInformationFormat="3". 62 # VCCLComilerTool.DebugInformationFormat="3".
64 # 63 #
65 # /Zi ends up with multiple compiler invocations trying to updat 64 # /Zi ends up with multiple compiler invocations trying to updat
66 # the same vc80.pdb file at the same time, with race conditions 65 # the same vc80.pdb file at the same time, with race conditions
67 # and permission problems. We're using /Z7 because it makes things 66 # and permission problems. We're using /Z7 because it makes things
68 # work even in parallel builds, without special config to avoid 67 # work even in parallel builds, without special config to avoid
69 # multiple simultaneous updates the vc80.pdb file. All the 68 # multiple simultaneous updates the vc80.pdb file. All the
70 # debugging information and capability still end up in the 69 # debugging information and capability still end up in the
71 # executables. 70 # executables.
72 '/Z7', # VCCLCompilerTool.DebugInformationFormat="1" 71 '/Z7', # VCCLCompilerTool.DebugInformationFormat="1"
73 72
74 # VCCLCompilerTool.DisableSpecificWarnings="4503; 4819" 73 # VCCLCompilerTool.DisableSpecificWarnings="4503; 4819"
75 '/wd4503', 74 '/wd4503',
76 '/wd4819', 75 '/wd4819',
77 ], 76 ],
78 LIBPATH = [ 77 LIBPATH = [
79 '$PLATFORMSDK_VISTA/Lib', 78 '$PLATFORMSDK_6_1/Lib',
80 '$PLATFORMSDK_VISTA/VC/LIB',
81 '$VISUAL_STUDIO/VC/atlmfc/lib', 79 '$VISUAL_STUDIO/VC/atlmfc/lib',
82 ], 80 ],
83 LIBS = [ 81 LIBS = [
84 'msimg32', 82 'msimg32',
85 'psapi', 83 'psapi',
86 'usp10.lib', 84 'usp10.lib',
87 'version', 85 'version',
88 'wininet', 86 'wininet',
89 'ws2_32', 87 'ws2_32',
90 ], 88 ],
(...skipping 16 matching lines...) Expand all
107 env.FilterOut( 105 env.FilterOut(
108 CCFLAGS = [ 106 CCFLAGS = [
109 '/GM', # VCCLCompilerTool.MinimalRebuild="false" 107 '/GM', # VCCLCompilerTool.MinimalRebuild="false"
110 '/EH', # VCCLCompilerTool.ExceptionHandling="0" 108 '/EH', # VCCLCompilerTool.ExceptionHandling="0"
111 ], 109 ],
112 ) 110 )
113 elif env['PLATFORM'] == 'posix': 111 elif env['PLATFORM'] == 'posix':
114 pass 112 pass
115 elif env['PLATFORM'] == 'mac': 113 elif env['PLATFORM'] == 'mac':
116 pass 114 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