From 55329d53c0322b66da982bccf0dc2a28c7c7fc8c Mon Sep 17 00:00:00 2001 From: "sgk@google.com" Date: Thu, 31 Jul 2008 07:25:19 +0000 Subject: 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 --- chrome/plugin/SConscript | 44 +++++++++++++++++--------------------------- 1 file changed, 17 insertions(+), 27 deletions(-) (limited to 'chrome/plugin') diff --git a/chrome/plugin/SConscript b/chrome/plugin/SConscript index 8dbb9ef..c53c37a 100644 --- a/chrome/plugin/SConscript +++ b/chrome/plugin/SConscript @@ -32,42 +32,32 @@ Import('env') env = env.Clone() - env.Prepend( CPPPATH = [ - Dir("#/../third_party/npapi"), - Dir("#/../chrome/tools/build/win"), - Dir("#/../skia/include"), - Dir("#/../skia/include/corecg"), - Dir("#/../skia/platform"), - Dir("#/.."), - ], - CPPDEFINES = [ - "CERT_CHAIN_PARA_HAS_EXTRA_FIELDS", - "WIN32_LEAN_AND_MEAN", + '$NPAPI_DIR', + '$CHROME_DIR/tools/build/win', + '$SKIA_DIR/include', + '$SKIA_DIR/include/corecg', + '$SKIA_DIR/platform', + '#/..', ], CCFLAGS = [ '/TP', - - #'/Wp64', - - '/wd4503', - '/wd4819', ], ) input_files = [ - "npobject_proxy.cc", - "webplugin_proxy.cc", - "webplugin_delegate_stub.cc", - "plugin_thread.cc", - "plugin_process.cc", - "plugin_main.cc", - "plugin_channel_base.cc", - "plugin_channel.cc", - "chrome_plugin_host.cc", - "npobject_util.cc", - "npobject_stub.cc", + 'chrome_plugin_host.cc', + 'npobject_proxy.cc', + 'npobject_stub.cc', + 'npobject_util.cc', + 'plugin_channel.cc', + 'plugin_channel_base.cc', + 'plugin_main.cc', + 'plugin_process.cc', + 'plugin_thread.cc', + 'webplugin_delegate_stub.cc', + 'webplugin_proxy.cc', ] env.StaticLibrary('plugin', input_files) -- cgit v1.1