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 /chrome/app/theme | |
| 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 'chrome/app/theme')
| -rw-r--r-- | chrome/app/theme/SConscript | 86 |
1 files changed, 42 insertions, 44 deletions
diff --git a/chrome/app/theme/SConscript b/chrome/app/theme/SConscript index 6cd619e..0f7664d 100644 --- a/chrome/app/theme/SConscript +++ b/chrome/app/theme/SConscript @@ -33,58 +33,56 @@ env = env.Clone() env_res = env_res.Clone()
env_res.Append(
- CPPPATH = [
- ".",
- "#/../chrome/Debug/obj/chrome_dll",
- "#/..",
- "#/../chrome/Debug/obj",
- ],
- RCFLAGS = [
- ["/l", "0x409"],
- ],
+ CPPPATH = [
+ '.',
+ '#/..',
+ ],
+ RCFLAGS = [
+ ['/l', '0x409'],
+ ],
)
-res = env_res.RES("theme_resources.rc")
+res = env_res.RES('theme_resources.rc')
env.Append(
- LINKFLAGS = [
- "/INCREMENTAL:NO",
- '/DELAYLOAD:"dwmapi.dll',
- '/DELAYLOAD:"uxtheme.dll',
+ LINKFLAGS = [
+ '/INCREMENTAL:NO',
+ '/DELAYLOAD:"dwmapi.dll"',
+ '/DELAYLOAD:"uxtheme.dll"',
- "/NOENTRY",
- '/BASE:"0x3CE00000"',
- "/MACHINE:X86",
- "/FIXED:No",
+ '/NOENTRY',
+ '/BASE:"0x3CE00000"',
+ '/MACHINE:X86',
+ '/FIXED:No',
- "/safeseh",
- "/dynamicbase",
- "/ignore:4199",
- "/nxcompat",
- ],
- LIBS = [
- "wininet.lib",
- "version.lib",
- "msimg32.lib",
- "ws2_32.lib",
- "usp10.lib",
- "psapi.lib",
- "kernel32.lib",
- "user32.lib",
- "gdi32.lib",
- "winspool.lib",
- "comdlg32.lib",
- "advapi32.lib",
- "shell32.lib",
- "ole32.lib",
- "oleaut32.lib",
- "uuid.lib",
- "odbc32.lib",
- "odbccp32.lib",
- "DelayImp.lib",
- ],
+ '/safeseh',
+ '/dynamicbase',
+ '/ignore:4199',
+ '/nxcompat',
+ ],
+ LIBS = [
+ 'wininet.lib',
+ 'version.lib',
+ 'msimg32.lib',
+ 'ws2_32.lib',
+ 'usp10.lib',
+ 'psapi.lib',
+ 'kernel32.lib',
+ 'user32.lib',
+ 'gdi32.lib',
+ 'winspool.lib',
+ 'comdlg32.lib',
+ 'advapi32.lib',
+ 'shell32.lib',
+ 'ole32.lib',
+ 'oleaut32.lib',
+ 'uuid.lib',
+ 'odbc32.lib',
+ 'odbccp32.lib',
+ 'DelayImp.lib',
+ ],
)
themes_default = env.SharedLibrary("$CHROME_DIR/themes/default", res)
|