diff options
author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-20 01:12:38 +0000 |
---|---|---|
committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-20 01:12:38 +0000 |
commit | 5c6f1c6b32f9da207706cf2d94560196e9d20303 (patch) | |
tree | 9442eb8482e433b812c917e7c1760c3472d8dab7 /webkit/SConscript | |
parent | 73f5d66b06b9a02626a8addecb24986a88430176 (diff) | |
download | chromium_src-5c6f1c6b32f9da207706cf2d94560196e9d20303.zip chromium_src-5c6f1c6b32f9da207706cf2d94560196e9d20303.tar.gz chromium_src-5c6f1c6b32f9da207706cf2d94560196e9d20303.tar.bz2 |
Finish release (opt) builds on Windows, including the parallel
build\*.scons structure (mirroring build\*.vsprops files):
* Use env.ApplySConscript() instead of env.SConscript with a
hand-crafted dictionary defining 'env'.
* Move various CPPPATH, CCFLAGS, CPPDEFINES, LIBS and LIBPATH
definitions from build/SConscript.main and target-specific
*.scons files into the build\*.scons files that mirror the
existing build\*.vsprops hierarchy.
* Use the new build\{debug,release}.scons files to update the
windows_dbg and windows_opt construction environments.
* Mirror current support for CHROME_BUILD_TYPE and CHROMIUM_BUILD
external environment variables.
* Remove hard-coded /TP options.
* Massage $CXXFLAGS to remove $CCFLAGS, avoiding duplication of options
on command lines. Handle the ripple effect in $PCHCOM by adding
$CCFLAGS back to that command line.
* Delete hammer's default settings of {CC,LINK}FLAGS_{DEBUG,OPTIMIZED}
so they don't pollute our construction environments.
* Update chrome config to link against v8 for opt, v8_g for dbg.
* Get rid of fragile by-hand order of using_net.scons before other
using_*.scons files. We're now using --start-group and --end-group
on Linux to deal with dependency cycles in libraries.
Review URL: http://codereview.chromium.org/11478
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5741 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/SConscript')
-rw-r--r-- | webkit/SConscript | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/webkit/SConscript b/webkit/SConscript index f6924bf..08b05fe 100644 --- a/webkit/SConscript +++ b/webkit/SConscript @@ -240,8 +240,6 @@ if env['PLATFORM'] == 'win32': '_CRT_NONSTDC_NO_WARNINGS', '_CRT_NONSTDC_NO_DEPRECATE', ['CRASH', '__debugbreak'], - '_WIN32_WINNT=0x0600', - 'WINVER=0x0600', ]) env.Prepend( |