Commit 8cd26e6a authored by bfulgham@webkit.org's avatar bfulgham@webkit.org

Unreviewed build fix.

* win/WebKit2.vcproj: Disable CG-specific WKImageCG.cpp from
Debug_Cairo_CFLite/Release_Cario_CFLite builds.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74980 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 0517bbfe
2011-01-04 Brent Fulgham <bfulgham@webkit.org>
Unreviewed build fix.
* win/WebKit2.vcproj: Disable CG-specific WKImageCG.cpp from
Debug_Cairo_CFLite/Release_Cario_CFLite builds.
2011-01-04 Brady Eidson <beidson@apple.com>
Reviewed by Darin Adler.
......@@ -18,7 +18,7 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="2"
InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\WebKit2Common.vsprops;.\WebKit2DirectX.vsprops;.\WebKit2Apple.vsprops"
InheritedPropertySheets="..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\WebKit2Common.vsprops;.\WebKit2DirectX.vsprops;.\WebKit2Apple.vsprops"
CharacterSet="1"
>
<Tool
......@@ -79,7 +79,7 @@
<Configuration
Name="Release|Win32"
ConfigurationType="2"
InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WebKit2Common.vsprops;.\WebKit2DirectX.vsprops;.\WebKit2Apple.vsprops"
InheritedPropertySheets="..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WebKit2Common.vsprops;.\WebKit2DirectX.vsprops;.\WebKit2Apple.vsprops"
CharacterSet="1"
>
<Tool
......@@ -140,7 +140,7 @@
<Configuration
Name="Debug_Cairo_CFLite|Win32"
ConfigurationType="2"
InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\cURL.vsprops;.\WebKit2Common.vsprops;.\WebKit2CFLite.vsprops;$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops"
InheritedPropertySheets="..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;..\..\WebKitLibraries\win\tools\vsprops\cURL.vsprops;.\WebKit2Common.vsprops;.\WebKit2CFLite.vsprops;..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops"
CharacterSet="1"
>
<Tool
......@@ -202,7 +202,7 @@
<Configuration
Name="Release_Cairo_CFLite|Win32"
ConfigurationType="2"
InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\cURL.vsprops;.\WebKit2Common.vsprops;.\WebKit2CFLite.vsprops"
InheritedPropertySheets="..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;..\..\WebKitLibraries\win\tools\vsprops\cURL.vsprops;.\WebKit2Common.vsprops;.\WebKit2CFLite.vsprops"
CharacterSet="1"
>
<Tool
......@@ -263,7 +263,7 @@
<Configuration
Name="Debug_All|Win32"
ConfigurationType="2"
InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops;.\WebKit2Common.vsprops;.\WebKit2DirectX.vsprops;.\WebKit2Apple.vsprops"
InheritedPropertySheets="..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops;.\WebKit2Common.vsprops;.\WebKit2DirectX.vsprops;.\WebKit2Apple.vsprops"
CharacterSet="1"
>
<Tool
......@@ -324,7 +324,7 @@
<Configuration
Name="Release_LTCG|Win32"
ConfigurationType="2"
InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WebKit2Common.vsprops;.\WebKit2DirectX.vsprops;.\WebKit2Apple.vsprops"
InheritedPropertySheets="..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WebKit2Common.vsprops;.\WebKit2DirectX.vsprops;.\WebKit2Apple.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
......@@ -951,6 +951,22 @@
<File
RelativePath="..\Shared\API\c\cg\WKImageCG.cpp"
>
<FileConfiguration
Name="Debug_Cairo_CFLite|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release_Cairo_CFLite|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\Shared\API\c\cg\WKImageCG.h"
......@@ -2035,15 +2051,15 @@
>
</File>
<File
RelativePath="..\UIProcess\WebDatabaseManagerProxyClient.cpp"
RelativePath="..\UIProcess\WebDatabaseManagerProxy.messages.in"
>
</File>
<File
RelativePath="..\UIProcess\WebDatabaseManagerProxyClient.h"
RelativePath="..\UIProcess\WebDatabaseManagerProxyClient.cpp"
>
</File>
<File
RelativePath="..\UIProcess\WebDatabaseManagerProxy.messages.in"
RelativePath="..\UIProcess\WebDatabaseManagerProxyClient.h"
>
</File>
<File
......@@ -2577,10 +2593,10 @@
RelativePath="..\UIProcess\win\LayerBackedDrawingAreaProxyWin.cpp"
>
</File>
<File
RelativePath="..\UIProcess\win\TextCheckerWin.cpp"
>
</File>
<File
RelativePath="..\UIProcess\win\TextCheckerWin.cpp"
>
</File>
<File
RelativePath="..\UIProcess\win\WebContextMenuProxyWin.cpp"
>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment