diff options
author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 17:16:46 +0000 |
---|---|---|
committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 17:16:46 +0000 |
commit | da6654b0465478b0549e593c1efb45bd44756965 (patch) | |
tree | 487788278214089228f23098346c1d02b5acfec4 /chrome/app/resources | |
parent | 1fbb43878f7f68c1770a12847ecd46c0f1413b3e (diff) | |
download | chromium_src-da6654b0465478b0549e593c1efb45bd44756965.zip chromium_src-da6654b0465478b0549e593c1efb45bd44756965.tar.gz chromium_src-da6654b0465478b0549e593c1efb45bd44756965.tar.bz2 |
Next round of SCons changes:
* Add 'gdm_fp' to the $LIBS setting in base\using_base.scons
(to be removed when that library moves into base\third_party).
* Have the grit Scanner search the Repository() copy of the source
file (necessary now that $TARGET_ROOT has changed).
* Change all the SConscript files underneath chrome\test and
chrome\tools to *.scons files, including updating their
contents with the current patterns.
* Add dependencies of the local_settings_*.res files on
the corresponding google_chrome_string_*.rc files, so they
get generated properly.
* Add generation of the chrome_exe.res resource file.
* Comment out some unnecessary .lib settings in the base
construction environment.
Review URL: http://codereview.chromium.org/10745
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5480 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/resources')
-rw-r--r-- | chrome/app/resources/SConscript | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/app/resources/SConscript b/chrome/app/resources/SConscript index cfbf1a0..b9ed420 100644 --- a/chrome/app/resources/SConscript +++ b/chrome/app/resources/SConscript @@ -66,7 +66,10 @@ rc_files = [ resources = [] for rc in rc_files: - resources.extend(env_res.RES(rc)) + res = env_res.RES(rc) + resources.extend(res) + # TODO(sgk): find out why this implicit dependency isn't discovered + env.Depends(res, rc.replace('locale_settings', 'google_chrome_strings')) env.Append( |