diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-25 17:20:48 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-25 17:20:48 +0000 |
| commit | 7002ac6566bb5472a99d0f8f3f6f4932e86dab44 (patch) | |
| tree | 2102518edab4ba7adbbbd38e7934be3c341de65b /chrome/app/theme | |
| parent | 689e237ec010792fe78343d9eff48539050481b0 (diff) | |
| download | chromium_src-7002ac6566bb5472a99d0f8f3f6f4932e86dab44.zip chromium_src-7002ac6566bb5472a99d0f8f3f6f4932e86dab44.tar.gz chromium_src-7002ac6566bb5472a99d0f8f3f6f4932e86dab44.tar.bz2 | |
Fix SCons modules build on Windows:
* Add 'midl' Tool module.
* Filter out the default OS_WINDOWS= definition from the Hammer
modules, which messes up our build.
* Fix the $PLATFORMSDK_VISTA definition.
* Remove the current directory from the 'base' Alias (avoid cycles).
* Remove by-hand addition of .lib, .pdb and .ilk files to the target
list when build shared libraries (multiple places).
* Comment out a post-action Touch() of the themes/default resource.
(Thanks to bradnelson for many of the above individual fixes.)
Review URL: http://codereview.chromium.org/8207
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3980 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/theme')
| -rw-r--r-- | chrome/app/theme/SConscript | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/app/theme/SConscript b/chrome/app/theme/SConscript index 8efaa2e..6c013ca 100644 --- a/chrome/app/theme/SConscript +++ b/chrome/app/theme/SConscript @@ -44,7 +44,8 @@ env.Append( themes_default = env.ChromeSharedLibrary("$CHROME_DIR/themes/default", res) -env.AddPostAction(themes_default[1], Touch(themes_default[1:])) +# TODO(bradnelson): figure out why this was needed +#env.AddPostAction(themes_default[1], Touch(themes_default[1:])) i = env.Install("$TARGET_ROOT/themes", themes_default) env.Alias('chrome', i) |