diff options
| author | sgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-03 06:21:25 +0000 |
|---|---|---|
| committer | sgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-03 06:21:25 +0000 |
| commit | 3b00779a8511730abc3935e0f971b7cbdcbc0408 (patch) | |
| tree | 019e1eb3f48043a1134da517705cb665555aa48b /tools/grit | |
| parent | 769c475d2ee42dfd4c84a5401da543eed91fb61a (diff) | |
| download | chromium_src-3b00779a8511730abc3935e0f971b7cbdcbc0408.zip chromium_src-3b00779a8511730abc3935e0f971b7cbdcbc0408.tar.gz chromium_src-3b00779a8511730abc3935e0f971b7cbdcbc0408.tar.bz2 | |
Revert last checkin to fix resources in Release builds.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/119075
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17468 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/grit')
| -rw-r--r-- | tools/grit/build/grit_localized_resources.rules | 4 | ||||
| -rw-r--r-- | tools/grit/build/grit_resources.rules | 4 | ||||
| -rw-r--r-- | tools/grit/build/using_generated_resources.vsprops | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tools/grit/build/grit_localized_resources.rules b/tools/grit/build/grit_localized_resources.rules index 940ff5d..3cacb53 100644 --- a/tools/grit/build/grit_localized_resources.rules +++ b/tools/grit/build/grit_localized_resources.rules @@ -7,8 +7,8 @@ <CustomBuildRule Name="GRIT Generated Localized Resources" DisplayName="GRIT Generated Localized Resources" - CommandLine="$(SolutionDir)..\tools\grit\build\grit_resource_file.bat [inputs] "$(SolutionDir)" "$(OutDir)\obj\global_intermediate\chrome" [AllOptions]" - Outputs="$(OutDir)\obj\global_intermediate\chrome\$(InputName)_en-US.pak" + CommandLine="$(SolutionDir)..\tools\grit\build\grit_resource_file.bat [inputs] "$(SolutionDir)" "$(OutDir)\grit_derived_sources" [AllOptions]" + Outputs="$(OutDir)\grit_derived_sources\$(InputName)_en-US.pak" AdditionalDependencies="$(SolutionDir)..\tools\grit\build\grit_resource_file.bat;$(SolutionDir)..\tools\grit\grit.py; resources\$(InputName)_ar.xtb; resources\$(InputName)_bg.xtb; diff --git a/tools/grit/build/grit_resources.rules b/tools/grit/build/grit_resources.rules index 52f7b27..2465ad4 100644 --- a/tools/grit/build/grit_resources.rules +++ b/tools/grit/build/grit_resources.rules @@ -7,8 +7,8 @@ <CustomBuildRule
Name="GRIT Generated Resources"
DisplayName="GRIT Generated Resources"
- CommandLine="$(SolutionDir)..\tools\grit\build\grit_resource_file.bat [inputs] "$(SolutionDir)" "$(OutDir)\obj\global_intermediate\chrome" [AllOptions]"
- Outputs="$(OutDir)\obj\global_intermediate\chrome\$(InputName).rc;$(OutDir)\obj\global_intermediate\chrome\$(InputName).pak"
+ CommandLine="$(SolutionDir)..\tools\grit\build\grit_resource_file.bat [inputs] "$(SolutionDir)" "$(OutDir)\grit_derived_sources" [AllOptions]"
+ Outputs="$(OutDir)\grit_derived_sources\$(InputName).rc;$(OutDir)\grit_derived_sources\$(InputName).pak"
AdditionalDependencies="$(SolutionDir)..\tools\grit\build\grit_resource_file.bat;$(SolutionDir)..\tools\grit\grit.py"
FileExtensions="*.grd"
ExecutionDescription="Generating resources..."
diff --git a/tools/grit/build/using_generated_resources.vsprops b/tools/grit/build/using_generated_resources.vsprops index 0f445e5..18d05aa 100644 --- a/tools/grit/build/using_generated_resources.vsprops +++ b/tools/grit/build/using_generated_resources.vsprops @@ -6,6 +6,6 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(OutDir)\obj\global_intermediate\chrome";"$(SolutionDir)\$(configurationName)\obj\global_intermediate\chrome";"$(OutDir)\obj\global_intermediate\net";"$(OutDir)\obj\global_intermediate\webkit"" + AdditionalIncludeDirectories=""$(OutDir)\grit_derived_sources";"$(SolutionDir)\$(configurationName)\grit_derived_sources";"$(OutDir)\obj\global_intermediate\net";"$(OutDir)\obj\global_intermediate\webkit"" /> </VisualStudioPropertySheet> |