summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/browser.vcproj26
-rw-r--r--webkit/build/WebCore/WebCore.vcproj56
2 files changed, 68 insertions, 14 deletions
diff --git a/chrome/browser/browser.vcproj b/chrome/browser/browser.vcproj
index 280a5c4..3449e2b 100644
--- a/chrome/browser/browser.vcproj
+++ b/chrome/browser/browser.vcproj
@@ -21,7 +21,7 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="4"
- InheritedPropertySheets=".\browser.vsprops;$(SolutionDir)..\build\debug.vsprops"
+ InheritedPropertySheets=".\browser.vsprops;$(SolutionDir)..\build\debug.vsprops;..\tools\build\win\precompiled_wtl.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
@@ -450,6 +450,30 @@
>
</File>
<File
+ RelativePath="..\tools\build\win\precompiled_wtl.cc"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\tools\build\win\precompiled_wtl.h"
+ >
+ </File>
+ <File
RelativePath=".\profile.cc"
>
</File>
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index e2b9c10..70f42d3 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -18,7 +18,7 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="4"
- InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;.\webcore.vsprops"
+ InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;..\precompiled_webkit.vsprops;.\webcore.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
@@ -27,6 +27,9 @@
Name="VCCustomBuildTool"
/>
<Tool
+ Name="WebKitVersion"
+ />
+ <Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
@@ -78,6 +81,9 @@
Name="VCCustomBuildTool"
/>
<Tool
+ Name="WebKitVersion"
+ />
+ <Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
@@ -669,15 +675,15 @@
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\loader\DocumentThreadableLoader.cpp"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\loader\EmptyClients.h"
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\loader\DocumentThreadableLoader.h"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\loader\DocumentThreadableLoader.cpp"
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\loader\EmptyClients.h"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\loader\DocumentThreadableLoader.h"
>
</File>
<File
@@ -3312,7 +3318,7 @@
RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderLegend.h"
>
</File>
- <File
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderLineBoxList.cpp"
>
</File>
@@ -4477,19 +4483,19 @@
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\dom\FormControlElement.cpp"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\dom\FormControlElementWithState.cpp"
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\dom\FormControlElement.h"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\dom\FormControlElementWithState.h"
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\dom\FormControlElementWithState.cpp"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\dom\FormControlElement.cpp"
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\dom\FormControlElementWithState.h"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\dom\FormControlElement.h"
>
</File>
<File
@@ -4637,19 +4643,19 @@
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\dom\OptionElement.cpp"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\dom\OptionGroupElement.cpp"
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\dom\OptionElement.h"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\dom\OptionGroupElement.h"
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\dom\OptionGroupElement.cpp"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\dom\OptionElement.cpp"
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\dom\OptionGroupElement.h"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\dom\OptionElement.h"
>
</File>
<File
@@ -7505,6 +7511,30 @@
</File>
</Filter>
</Filter>
+ <File
+ RelativePath="..\precompiled_webkit.cc"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\precompiled_webkit.h"
+ >
+ </File>
</Files>
<Globals>
</Globals>