Title: [146416] trunk/Tools
- Revision
- 146416
- Author
- [email protected]
- Date
- 2013-03-20 17:08:39 -0700 (Wed, 20 Mar 2013)
Log Message
[WinCairo] Unreviewed build fix for VS2010.
Had to add WinCairo-specific property sheets to deal with some
library and path differences with the main Apple port.
* DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj:
* DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeDebugWinCairo.props:
* DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeReleaseWinCairo.props:
* DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffCommonWinCairo.props: Added.
* DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffDebugWinCairo.props: Added.
* DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffReleaseWinCairo.props: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/ChangeLog (146415 => 146416)
--- trunk/Tools/ChangeLog 2013-03-21 00:06:57 UTC (rev 146415)
+++ trunk/Tools/ChangeLog 2013-03-21 00:08:39 UTC (rev 146416)
@@ -1,3 +1,17 @@
+2013-03-20 Brent Fulgham <[email protected]>
+
+ [WinCairo] Unreviewed build fix for VS2010.
+
+ Had to add WinCairo-specific property sheets to deal with some
+ library and path differences with the main Apple port.
+
+ * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj:
+ * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeDebugWinCairo.props:
+ * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeReleaseWinCairo.props:
+ * DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffCommonWinCairo.props: Added.
+ * DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffDebugWinCairo.props: Added.
+ * DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffReleaseWinCairo.props: Added.
+
2013-03-20 Benjamin Poulain <[email protected]>
[WK2] Remove VIEW_MODE_CSS_MEDIA from WebKit2
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj (146415 => 146416)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj 2013-03-21 00:06:57 UTC (rev 146415)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj 2013-03-21 00:08:39 UTC (rev 146416)
@@ -96,13 +96,14 @@
<ClCompile Include="..\..\AccessibilityUIElement.cpp" />
<ClCompile Include="..\..\cairo\PixelDumpSupportCairo.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\..\cg\PixelDumpSupportCG.cpp" />
+ <ClCompile Include="..\..\cg\PixelDumpSupportCG.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="..\..\CyclicRedundancyCheck.cpp" />
<ClCompile Include="..\..\DumpRenderTreeCommon.cpp" />
<ClCompile Include="..\..\GCController.cpp" />
@@ -136,13 +137,14 @@
<ClInclude Include="..\..\AccessibilityUIElement.h" />
<ClInclude Include="..\..\cairo\PixelDumpSupportCairo.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
</ClInclude>
- <ClInclude Include="..\..\cg\PixelDumpSupportCG.h" />
+ <ClInclude Include="..\..\cg\PixelDumpSupportCG.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ </ClInclude>
<ClInclude Include="..\..\config.h" />
<ClInclude Include="..\..\CyclicRedundancyCheck.h" />
<ClInclude Include="..\..\DumpRenderTree.h" />
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeDebugWinCairo.props (146415 => 146416)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeDebugWinCairo.props 2013-03-21 00:06:57 UTC (rev 146415)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeDebugWinCairo.props 2013-03-21 00:08:39 UTC (rev 146416)
@@ -9,4 +9,9 @@
<Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\WebKit\WebKitCFLite.props" />
<Import Project="DumpRenderTreeCommon.props" />
</ImportGroup>
-</Project>
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <AdditionalIncludeDirectories>$(ProjectDir)\..\..\cairo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ </ItemDefinitionGroup>
+</Project>
\ No newline at end of file
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeReleaseWinCairo.props (146415 => 146416)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeReleaseWinCairo.props 2013-03-21 00:06:57 UTC (rev 146415)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeReleaseWinCairo.props 2013-03-21 00:08:39 UTC (rev 146416)
@@ -9,4 +9,9 @@
<Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\WebKit\WebKitCFLite.props" />
<Import Project="DumpRenderTreeCommon.props" />
</ImportGroup>
-</Project>
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <AdditionalIncludeDirectories>$(ProjectDir)\..\..\cairo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ </ItemDefinitionGroup>
+</Project>
\ No newline at end of file
Added: trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffCommonWinCairo.props (0 => 146416)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffCommonWinCairo.props (rev 0)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffCommonWinCairo.props 2013-03-21 00:08:39 UTC (rev 146416)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <AdditionalIncludeDirectories>$(ConfigurationBuildDir)\include;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\_javascript_Core;$(WebKit_Libraries)\include;$(WebKit_Libraries)\include\private;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <Link>
+ <AdditionalOptions>/NXCOMPAT %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalDependencies>_javascript_Core.lib;CFLite.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+</Project>
Added: trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffDebugWinCairo.props (0 => 146416)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffDebugWinCairo.props (rev 0)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffDebugWinCairo.props 2013-03-21 00:08:39 UTC (rev 146416)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets">
+ <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />
+ <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\debug.props" />
+ <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\WinCairo.props" />
+ <Import Project="ImageDiffCommonWinCairo.props" />
+ </ImportGroup>
+</Project>
Added: trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffReleaseWinCairo.props (0 => 146416)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffReleaseWinCairo.props (rev 0)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffReleaseWinCairo.props 2013-03-21 00:08:39 UTC (rev 146416)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets">
+ <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />
+ <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />
+ <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\WinCairo.props" />
+ <Import Project="ImageDiffCommonWinCairo.props" />
+ </ImportGroup>
+</Project>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
