summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
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 /chrome/renderer
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 'chrome/renderer')
-rw-r--r--chrome/renderer/SConscript24
1 files changed, 3 insertions, 21 deletions
diff --git a/chrome/renderer/SConscript b/chrome/renderer/SConscript
index e9b83a8..200dba7 100644
--- a/chrome/renderer/SConscript
+++ b/chrome/renderer/SConscript
@@ -32,33 +32,17 @@ Import('env')
env = env.Clone()
-
-#/Yu"precompiled_wtl.h"
-#/Fp"C:\src\trunk\chrome\Debug\obj\browser\precompiled_wtl.pch"
-#/Fo"C:\src\trunk\chrome\Debug\obj\browser\\"
-#/Fd"C:\src\trunk\chrome\Debug\obj\browser\vc80.pdb"
-#/W3
-#/WX
-#/FI "precompiled_wtl.h"
-
env.Prepend(
CPPPATH = [
- env.Dir('../app/resources'),
- env.Dir('#/tools/build/win'),
- env.Dir('#/..'),
+ '$CHROME_DIR/app/resources',
+ '#/tools/build/win',
+ '#/..',
],
CPPDEFINES = [
'U_STATIC_IMPLEMENTATION',
- 'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',
- 'WIN32_LEAN_AND_MEAN',
],
CCFLAGS = [
'/TP',
-
- '/Wp64',
-
- '/wd4503',
- '/wd4819',
],
)
@@ -67,8 +51,6 @@ env.Append(
'third_party/wtl/include',
'$ICU38_DIR/public/common',
'$ICU38_DIR/public/i18n',
- #Dir('#../chrome/Debug/obj/generated_resources'),
- #Dir('#../chrome/Debug/obj/localized_strings'),
'$NPAPI_DIR',
'$SKIA_DIR/include',
'$SKIA_DIR/include/corecg',