diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-20 19:44:38 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-20 19:44:38 +0000 |
| commit | aabc5941d897ee3df8afe71c5ba3ed0a398ca4dd (patch) | |
| tree | 01363ba8c69738e3e01df0c2ec0fa0fc0b31a6ba /webkit/build/WebCore | |
| parent | eb30cb13961a2fdf48395acf6e52bf00f70b75d7 (diff) | |
| download | chromium_src-aabc5941d897ee3df8afe71c5ba3ed0a398ca4dd.zip chromium_src-aabc5941d897ee3df8afe71c5ba3ed0a398ca4dd.tar.gz chromium_src-aabc5941d897ee3df8afe71c5ba3ed0a398ca4dd.tar.bz2 | |
Fix webkit_version.h generation ordering.
Solution files changes are:
- Glue now depends on WebCore_prebuild (and not WebCore).
- WebCore depends on WebCore_prebuild.
(Reapply R8295 with the path to version.xcconfig fixed)
Review URL: http://codereview.chromium.org/18416
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8299 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build/WebCore')
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 11 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore_prebuild.vcproj | 88 |
2 files changed, 88 insertions, 11 deletions
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index 5ffda11..5f8c1a5 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -13,9 +13,6 @@ /> </Platforms> <ToolFiles> - <ToolFile - RelativePath="..\webkit_version.rules" - /> </ToolFiles> <Configurations> <Configuration @@ -7370,14 +7367,6 @@ </File> </Filter> </Filter> - <Filter - Name="version" - > - <File - RelativePath="..\..\..\third_party\WebKit\WebCore\Configurations\Version.xcconfig" - > - </File> - </Filter> <File RelativePath="..\precompiled_webkit.cc" > diff --git a/webkit/build/WebCore/WebCore_prebuild.vcproj b/webkit/build/WebCore/WebCore_prebuild.vcproj new file mode 100644 index 0000000..1c5b7c7 --- /dev/null +++ b/webkit/build/WebCore/WebCore_prebuild.vcproj @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="WebCore_prebuild" + ProjectGUID="{1444235E-0E97-4C80-A73E-EE73F3706C32}" + RootNamespace="WebCore_prebuild" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + <ToolFile + RelativePath="..\webkit_version.rules" + /> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="10" + InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;..\precompiled_webkit.vsprops;.\webcore.vsprops" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="WebKitVersion" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="10" + InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;.\webcore.vsprops" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="WebKitVersion" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\Configurations\Version.xcconfig" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="WebKitVersion" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="WebKitVersion" + /> + </FileConfiguration> + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> |