diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-08 21:58:04 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-08 21:58:04 +0000 |
| commit | 85aed525ca4109b6d3f9fe82d0b82c3a6d2cf722 (patch) | |
| tree | 78f12ef87462b62f1fd11a7116d1a771b9ca2e90 /webkit/webkit_kjs.sln | |
| parent | b11c6a558fe2e45617ed715fb98ed7d1ea2e9126 (diff) | |
| download | chromium_src-85aed525ca4109b6d3f9fe82d0b82c3a6d2cf722.zip chromium_src-85aed525ca4109b6d3f9fe82d0b82c3a6d2cf722.tar.gz chromium_src-85aed525ca4109b6d3f9fe82d0b82c3a6d2cf722.tar.bz2 | |
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
Diffstat (limited to 'webkit/webkit_kjs.sln')
| -rw-r--r-- | webkit/webkit_kjs.sln | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/webkit/webkit_kjs.sln b/webkit/webkit_kjs.sln index 6e340f1..c9603cb 100644 --- a/webkit/webkit_kjs.sln +++ b/webkit/webkit_kjs.sln @@ -96,6 +96,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "..\net\build\net.vcp Release.AspNetCompiler.Debug = "False" EndProjectSection ProjectSection(ProjectDependencies) = postProject + {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} {E13045CD-7E1F-4A41-9B18-8D288B2E7B41} = {E13045CD-7E1F-4A41-9B18-8D288B2E7B41} EndProjectSection EndProject @@ -399,6 +400,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "..\third_party\sq Release.AspNetCompiler.Debug = "False" EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net_resources", "..\net\build\net_resources.vcproj", "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -493,6 +500,10 @@ Global {867F64C9-D631-41A9-B467-13D6378A72AA}.Debug|Win32.Build.0 = Debug|Win32 {867F64C9-D631-41A9-B467-13D6378A72AA}.Release|Win32.ActiveCfg = Release|Win32 {867F64C9-D631-41A9-B467-13D6378A72AA}.Release|Win32.Build.0 = Release|Win32 + {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Win32.ActiveCfg = Debug|Win32 + {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Win32.Build.0 = Debug|Win32 + {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Release|Win32.ActiveCfg = Release|Win32 + {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Release|Win32.Build.0 = Release|Win32 {8C27D792-2648-4F5E-9ED0-374276327308}.Debug|Win32.ActiveCfg = Debug|Win32 {8C27D792-2648-4F5E-9ED0-374276327308}.Debug|Win32.Build.0 = Debug|Win32 {8C27D792-2648-4F5E-9ED0-374276327308}.Release|Win32.ActiveCfg = Release|Win32 @@ -597,6 +608,7 @@ Global {7100F41F-868D-4E99-80A2-AF8E6574749D} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B} {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B} {867F64C9-D631-41A9-B467-13D6378A72AA} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D} + {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B} {8C27D792-2648-4F5E-9ED0-374276327308} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B} {A0D94973-D355-47A5-A1E2-3456F321F010} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B} {A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B} |