diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-13 00:59:35 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-13 00:59:35 +0000 |
| commit | bc4451ceed50867267e75b6677c945e39442e332 (patch) | |
| tree | 19708267599270dc64d3763695883610fb673518 /webkit/webkit_armu.sln | |
| parent | afeb8f17bae749928b280fb6a755f3e4696d91d7 (diff) | |
| download | chromium_src-bc4451ceed50867267e75b6677c945e39442e332.zip chromium_src-bc4451ceed50867267e75b6677c945e39442e332.tar.gz chromium_src-bc4451ceed50867267e75b6677c945e39442e332.tar.bz2 | |
Move webkit_resources.rc to webkit_resources.grd. Add
webkit_resources.vcproj which creates the .rc files and have webkit
glue depend on it.
I had to add a flag to grit that allows a resource to be in the
header, but not in the .rc file. We do this for a test_shell only
resource that is not compiled in.
SCons build also works on windows.
I still need to update the other .sln files and mac build.
Review URL: http://codereview.chromium.org/17466
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7910 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/webkit_armu.sln')
| -rw-r--r-- | webkit/webkit_armu.sln | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/webkit/webkit_armu.sln b/webkit/webkit_armu.sln index 99a7e0b..3148efa 100644 --- a/webkit/webkit_armu.sln +++ b/webkit/webkit_armu.sln @@ -12,6 +12,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glue", "build\glue\glue.vcp Release.AspNetCompiler.Debug = "False" EndProjectSection ProjectSection(ProjectDependencies) = postProject + {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} {1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6} {2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673} {2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203} @@ -395,12 +396,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net_resources", "..\net\bui Release.AspNetCompiler.Debug = "False" EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webkit_resources", "build\webkit_resources\webkit_resources.vcproj", "{0B469837-3D46-484A-AFB3-C5A6C68730B9}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Debug|Win32.ActiveCfg = Debug|Win32 + {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Debug|Win32.Build.0 = Debug|Win32 + {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Release|Win32.ActiveCfg = Release|Win32 + {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Release|Win32.Build.0 = Release|Win32 {0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Win32.ActiveCfg = Debug|Win32 {0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Win32.Build.0 = Debug|Win32 {0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Release|Win32.ActiveCfg = Release|Win32 @@ -571,6 +582,7 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {0655DC38-C685-436C-8D99-7CF64CB2CC35} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B} + {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D} {0D04AEC1-6B68-492C-BCCF-808DFD69ABC6} = {4A249B49-19FB-4BD1-B017-718E7A4448EF} {0E5474AC-5996-4B13-87C0-4AE931EE0815} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B} {1832A374-8A74-4F9E-B536-69A699B3E165} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B} |