summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-07-31 07:25:19 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-07-31 07:25:19 +0000
commit55329d53c0322b66da982bccf0dc2a28c7c7fc8c (patch)
tree19550e26a26066035e41c036b21c415918b772d2 /base
parent1920e823284826c00ba11adb1ff3ccb7fba2f0f5 (diff)
downloadchromium_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 'base')
-rw-r--r--base/SConscript13
-rw-r--r--base/gfx/SConscript7
2 files changed, 1 insertions, 19 deletions
diff --git a/base/SConscript b/base/SConscript
index 0679437..be27771 100644
--- a/base/SConscript
+++ b/base/SConscript
@@ -40,16 +40,10 @@ env.Prepend(
],
CPPDEFINES = [
'U_STATIC_IMPLEMENTATION',
- 'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',
- 'WIN32_LEAN_AND_MEAN',
],
CCFLAGS = [
'/TP',
-
'/Wp64',
-
- '/wd4503',
- '/wd4819',
],
)
@@ -139,16 +133,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 = [
'/MANIFEST',
diff --git a/base/gfx/SConscript b/base/gfx/SConscript
index 4ec9e50..022b35f 100644
--- a/base/gfx/SConscript
+++ b/base/gfx/SConscript
@@ -46,17 +46,10 @@ env.Prepend(
'PNG_USER_CONFIG',
'CHROME_PNG_WRITE_SUPPORT',
'U_STATIC_IMPLEMENTATION',
- 'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',
- 'WIN32_LEAN_AND_MEAN',
],
CCFLAGS = [
'/TP',
-
- '/Wp64',
'/WX',
-
- '/wd4503',
- '/wd4819',
],
)