diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-31 07:25:19 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-31 07:25:19 +0000 |
| commit | 55329d53c0322b66da982bccf0dc2a28c7c7fc8c (patch) | |
| tree | 19550e26a26066035e41c036b21c415918b772d2 /net | |
| parent | 1920e823284826c00ba11adb1ff3ccb7fba2f0f5 (diff) | |
| download | chromium_src-55329d53c0322b66da982bccf0dc2a28c7c7fc8c.zip chromium_src-55329d53c0322b66da982bccf0dc2a28c7c7fc8c.tar.gz chromium_src-55329d53c0322b66da982bccf0dc2a28c7c7fc8c.tar.bz2 | |
Initial cleanups en route to coalescing the get-it-built cut-and-paste from various SConscripts into readable and maintainable shape. To wit:
* Put the near-universal settings of /DCERT_CHAIN_PARA_HAS_EXTRA_FIELDS, /DWIN32_LEAN_AND_MEAN, /wd4503 and /wd4819 in the base construction environment.
* Sort various unsorted source file lists.
* Fix indentation and quoting for consistency in a couple SConscript files that escaped previous dragnets.
* Eliminate two left-over uses of Split() for input file lists.
* Give the devenv invocation to build v8_shell.exe the full path to the relevant .vcproj file.
* Add /nologo to the base LINKFLAGS setting.
* Remove various CPPPATH and other settings that have been hanging around commented out from the Visual Studio build (in case we needed them, which we evidently don't).
* Get rid of unnecessary env.File() and env.Dir() calls in various settings (esp. CPPPATH) and source file lists.
* Add copyright notice to an overlooked SConscript file.
* Clean up version.bat invocation.
TBR: bradnelson
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/SConscript | 11 | ||||
| -rw-r--r-- | net/tools/tld_cleanup/SConscript | 3 |
2 files changed, 2 insertions, 12 deletions
diff --git a/net/SConscript b/net/SConscript index 5f52b01..fc9d706 100644 --- a/net/SConscript +++ b/net/SConscript @@ -45,11 +45,9 @@ env.Prepend( env.Append(
CPPDEFINES = [
'U_STATIC_IMPLEMENTATION',
- 'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',
],
CCFLAGS = [
- '/wd4503',
- '/wd4819',
+ '/Wp64',
],
)
@@ -163,16 +161,11 @@ env_tests.Prepend( '_WIN32_WINNT=0x0600',
'WINVER=0x0600',
'_HAS_EXCEPTIONS=0',
- 'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',
- 'WIN32_LEAN_AND_MEAN',
],
CCFLAGS = [
+ '/TP',
'/WX',
'/Wp64',
- '/TP',
-
- '/wd4503',
- '/wd4819',
],
LINKFLAGS = [
'/DELAYLOAD:"dwmapi.dll"',
diff --git a/net/tools/tld_cleanup/SConscript b/net/tools/tld_cleanup/SConscript index f4ef035..223f871f 100644 --- a/net/tools/tld_cleanup/SConscript +++ b/net/tools/tld_cleanup/SConscript @@ -40,9 +40,6 @@ env.Prepend( env.Append(
CCFLAGS = [
'/TP',
-
- '/wd4503',
- '/wd4819',
],
LINKFLAGS = [
|