summaryrefslogtreecommitdiffstats
path: root/webkit/build
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-05 21:58:01 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-05 21:58:01 +0000
commita05fffa7acec4c20372eac4a9f3401602fe72efc (patch)
tree2b57e8c3815f12f7daee3dec16efd1702aa82315 /webkit/build
parentca2865d4a3c9c007d713eb16a6dc7aea036b7964 (diff)
downloadchromium_src-a05fffa7acec4c20372eac4a9f3401602fe72efc.zip
chromium_src-a05fffa7acec4c20372eac4a9f3401602fe72efc.tar.gz
chromium_src-a05fffa7acec4c20372eac4a9f3401602fe72efc.tar.bz2
Some more GRIT refactoring.
Moved the grit .vsprops file from chrome/tools/build/win/ to /tools/grit/build and renamed to using_generated_resources.vsprops. Updated non-chrome projects to use the this new vsprops file. Created a new .rules file and renamed the old one. Now there are grit_resources.rules and grit_localized_resources.rules. The latter is what we use now, but I'll be adding some grd files that use the former in a follow up change. This is just vsprops reshuffling for now. I'll also add a using_generated_resources.scons in a follow up change. Review URL: http://codereview.chromium.org/14901 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
-rw-r--r--webkit/build/glue/glue.vsprops4
-rw-r--r--webkit/build/localized_strings/localized_strings.vcproj2
2 files changed, 3 insertions, 3 deletions
diff --git a/webkit/build/glue/glue.vsprops b/webkit/build/glue/glue.vsprops
index 29633cf..f120d30 100644
--- a/webkit/build/glue/glue.vsprops
+++ b/webkit/build/glue/glue.vsprops
@@ -3,11 +3,11 @@
ProjectType="Visual C++"
Version="8.00"
Name="glue"
- InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;..\webkit_common.vsprops"
+ InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;..\webkit_common.vsprops;$(SolutionDir)..\tools\grit\build\using_generated_resources.vsprops"
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\glue;&quot;$(OutDir)&quot;;&quot;$(OutDir)\grit_derived_sources&quot;;"
+ AdditionalIncludeDirectories="..\..\glue;&quot;$(OutDir)&quot;"
PreprocessorDefinitions="_SCL_SECURE_NO_DEPRECATE;_HAS_EXCEPTIONS=1"
WarnAsError="true"
/>
diff --git a/webkit/build/localized_strings/localized_strings.vcproj b/webkit/build/localized_strings/localized_strings.vcproj
index 5d5ba15..c0d3add 100644
--- a/webkit/build/localized_strings/localized_strings.vcproj
+++ b/webkit/build/localized_strings/localized_strings.vcproj
@@ -14,7 +14,7 @@
</Platforms>
<ToolFiles>
<ToolFile
- RelativePath="..\..\..\tools\grit\build\grit_resource_file.rules"
+ RelativePath="..\..\..\tools\grit\build\grit_localized_resources.rules"
/>
</ToolFiles>
<Configurations>