diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-12 17:14:07 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-12 17:14:07 +0000 |
| commit | 79a634351d4c69ce9570ab5ec952556347891db7 (patch) | |
| tree | e43e152e410305fd28c637d990fcf863623c427b /chrome/chrome.sln | |
| parent | e7736d75f1a69e8af68ca3d5610bce84c215cf0e (diff) | |
| download | chromium_src-79a634351d4c69ce9570ab5ec952556347891db7.zip chromium_src-79a634351d4c69ce9570ab5ec952556347891db7.tar.gz chromium_src-79a634351d4c69ce9570ab5ec952556347891db7.tar.bz2 | |
Second try of landing chrome_resources project. Changes from last time:
- fix scons dependencies by adding a target for grit/theme_resources.h
- fix mac build by adding grit to unittest include path
- fix check deps by adding rules for /grit dir.
Create a chrome_resources.vcproj that holds grd files that hold
non-string resources. Put browser_resources.grd into this vcproj.
Port theme_resources.rc/theme_resources.h to theme_resources.grd
and put it in the vcproj too.
I did a find/replace on the theme_resources include line.
Modify grit so header files go in grit_generated_resources/grit/
so the include path can be cleaner. I'll migrate the others
in follow up patches.
theme_resources.rc had a conditional include of distribution_resources.rc
so I had to add support for preprocessor defines to visual studio.
Review URL: http://codereview.chromium.org/24011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9664 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.sln')
| -rwxr-xr-x | chrome/chrome.sln | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/chrome/chrome.sln b/chrome/chrome.sln index 16776a7..173a45f 100755 --- a/chrome/chrome.sln +++ b/chrome/chrome.sln @@ -114,6 +114,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "views", "views\views.vcproj Release.AspNetCompiler.Debug = "False" EndProjectSection ProjectSection(ProjectDependencies) = postProject + {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject @@ -143,6 +144,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "automation", "test\automati Debug.AspNetCompiler.Debug = "True" Release.AspNetCompiler.Debug = "False" EndProjectSection + ProjectSection(ProjectDependencies) = postProject + {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icu", "..\third_party\icu38\build\icu.vcproj", "{8C27D792-2648-4F5E-9ED0-374276327308}" ProjectSection(WebsiteProperties) = preProject @@ -710,7 +714,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "locales", "locales", "{2325 app\locales\locale_settings.h = app\locales\locale_settings.h EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser_resources", "browser\resources\browser_resources.vcproj", "{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chrome_resources", "app\chrome_resources.vcproj", "{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}" ProjectSection(WebsiteProperties) = preProject Debug.AspNetCompiler.Debug = "True" Release.AspNetCompiler.Debug = "False" @@ -727,6 +731,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "theme_dll", "app\theme\them Debug.AspNetCompiler.Debug = "True" Release.AspNetCompiler.Debug = "False" EndProjectSection + ProjectSection(ProjectDependencies) = postProject + {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "security_tests", "test\security_tests\security_tests.vcproj", "{E750512D-FC7C-4C98-BF04-0A0DAF882055}" ProjectSection(WebsiteProperties) = preProject @@ -1797,6 +1804,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser_views", "browser\vi ProjectSection(ProjectDependencies) = postProject {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} {4052059A-D72B-4183-B5C2-9D1B099E9E35} = {4052059A-D72B-4183-B5C2-9D1B099E9E35} + {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject @@ -3345,7 +3353,7 @@ Global {B802A2FE-E4E2-4F5A-905A-D5128875C954} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B} {B84553C8-5676-427B-B3E4-23DDDC4DBC7B} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA} {B92AE829-E1CD-4781-824A-DCB1603A1672} = {1174D37F-6ABB-45DA-81B3-C631281273B7} - {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {97555540-8163-4D0F-BCAC-EFA0FFED3453} + {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B6867423-23BD-4588-9321-2D500F128A3D} {BA62FF5E-08A6-4102-9675-C12E8C9D4CC0} = {2325D8C4-8EF5-42AC-8900-492225750DE4} {BE6D5659-A8D5-4890-A42C-090DD10EF62C} = {1174D37F-6ABB-45DA-81B3-C631281273B7} {BF4F447B-72B5-4059-BE1B-F94337B1F385} = {97555540-8163-4D0F-BCAC-EFA0FFED3453} |