From 85aed525ca4109b6d3f9fe82d0b82c3a6d2cf722 Mon Sep 17 00:00:00 2001 From: "tc@google.com" Date: Thu, 8 Jan 2009 21:58:04 +0000 Subject: Remove net_resources.rc and net_resources.h and replace it with a grd file that generates the same thing. We want to do this so on linux, we will have grit generate the .h file and a platform specific resource file. There's some munging going on to be able to get the effective_tld_names_clean.dat file included in the rc. This works in visual studio and scons. I need to update chrome_kjs.sln and the webkit*.sln files and the mac build before committing. Review URL: http://codereview.chromium.org/16565 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7762 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/SConscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chrome/SConscript') diff --git a/chrome/SConscript b/chrome/SConscript index 142702b..fefd331 100644 --- a/chrome/SConscript +++ b/chrome/SConscript @@ -46,7 +46,7 @@ if env_res.Bit('windows'): test_data_res = env_res.RES('test/data/resource.rc') webkit_res = env_res.RES('$WEBKIT_DIR/glue/webkit_resources.rc') - net_res = '$NET_DIR/net_resources.res' + net_res = '$TARGET_ROOT/grit_derived_sources/net_resources.res' dll_resources = [ browser_res, -- cgit v1.1