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 /chrome/chrome.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 'chrome/chrome.sln')
| -rwxr-xr-x | chrome/chrome.sln | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/chrome/chrome.sln b/chrome/chrome.sln index ba07631..9542642 100755 --- a/chrome/chrome.sln +++ b/chrome/chrome.sln @@ -90,6 +90,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glue", "..\webkit\build\glu 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} @@ -1956,6 +1957,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net_resources", "..\net\bui Release.AspNetCompiler.Debug = "False" EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webkit_resources", "..\webkit\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|Mixed Platforms = Debug|Mixed Platforms @@ -1996,6 +2003,14 @@ Global {0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Release|Mixed Platforms.Build.0 = Release|Win32 {0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Release|Win32.ActiveCfg = Release|Win32 {0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Release|Win32.Build.0 = Release|Win32 + {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {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|Mixed Platforms.ActiveCfg = Release|Win32 + {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Release|Mixed Platforms.Build.0 = Release|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|Mixed Platforms.ActiveCfg = Debug|Win32 {0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -3183,6 +3198,7 @@ Global {032541FB-1E7C-4423-B657-4A71FE180C8A} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA} {0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4} = {2325D8C4-8EF5-42AC-8900-492225750DE4} {0A13F602-B497-4BC1-ABD8-03CA8E95B2AF} = {2325D8C4-8EF5-42AC-8900-492225750DE4} + {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E} {0D04AEC1-6B68-492C-BCCF-808DFD69ABC6} = {1174D37F-6ABB-45DA-81B3-C631281273B7} {0D54A5C4-B78B-41A2-BF8A-5DA48AC90495} = {2325D8C4-8EF5-42AC-8900-492225750DE4} {0E5474AC-5996-4B13-87C0-4AE931EE0815} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA} |