[WinCairo] Unreviewed build fix for VS2010.
authorbfulgham@webkit.org <bfulgham@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Mar 2013 00:08:39 +0000 (00:08 +0000)
committerbfulgham@webkit.org <bfulgham@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Mar 2013 00:08:39 +0000 (00:08 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@146416 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj
Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeDebugWinCairo.props
Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeReleaseWinCairo.props
Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffCommonWinCairo.props [new file with mode: 0644]
Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffDebugWinCairo.props [new file with mode: 0644]
Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffReleaseWinCairo.props [new file with mode: 0644]

index 579fb61..10664fa 100644 (file)
@@ -1,3 +1,17 @@
+2013-03-20  Brent Fulgham  <bfulgham@webkit.org>
+
+        [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  <bpoulain@apple.com>
 
         [WK2] Remove VIEW_MODE_CSS_MEDIA from WebKit2
index c3dd273..1795fb2 100644 (file)
     <ClCompile Include="..\..\AccessibilityUIElement.cpp" />\r
     <ClCompile Include="..\..\cairo\PixelDumpSupportCairo.cpp">\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\cg\PixelDumpSupportCG.cpp" />\r
+    <ClCompile Include="..\..\cg\PixelDumpSupportCG.cpp">\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>\r
+    </ClCompile>\r
     <ClCompile Include="..\..\CyclicRedundancyCheck.cpp" />\r
     <ClCompile Include="..\..\DumpRenderTreeCommon.cpp" />\r
     <ClCompile Include="..\..\GCController.cpp" />\r
     <ClInclude Include="..\..\AccessibilityUIElement.h" />\r
     <ClInclude Include="..\..\cairo\PixelDumpSupportCairo.h">\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\cg\PixelDumpSupportCG.h" />\r
+    <ClInclude Include="..\..\cg\PixelDumpSupportCG.h">\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>\r
+    </ClInclude>\r
     <ClInclude Include="..\..\config.h" />\r
     <ClInclude Include="..\..\CyclicRedundancyCheck.h" />\r
     <ClInclude Include="..\..\DumpRenderTree.h" />\r
index e46a43f..a87efac 100644 (file)
@@ -9,4 +9,9 @@
     <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\WebKit\WebKitCFLite.props" />\r
     <Import Project="DumpRenderTreeCommon.props" />\r
   </ImportGroup>\r
-</Project>\r
+  <ItemDefinitionGroup>\r
+    <ClCompile>\r
+      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\cairo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+  </ItemDefinitionGroup>\r
+</Project>
\ No newline at end of file
index 8d170ab..2a43458 100644 (file)
@@ -9,4 +9,9 @@
     <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\WebKit\WebKitCFLite.props" />\r
     <Import Project="DumpRenderTreeCommon.props" />\r
   </ImportGroup>\r
-</Project>\r
+  <ItemDefinitionGroup>\r
+    <ClCompile>\r
+      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\cairo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+  </ItemDefinitionGroup>\r
+</Project>
\ No newline at end of file
diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffCommonWinCairo.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffCommonWinCairo.props
new file mode 100644 (file)
index 0000000..380be3c
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemDefinitionGroup>\r
+    <ClCompile>\r
+      <AdditionalIncludeDirectories>$(ConfigurationBuildDir)\include;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\JavaScriptCore;$(WebKit_Libraries)\include;$(WebKit_Libraries)\include\private;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+    </ClCompile>\r
+    <Link>\r
+      <AdditionalOptions>/NXCOMPAT %(AdditionalOptions)</AdditionalOptions>\r
+      <AdditionalDependencies>JavaScriptCore.lib;CFLite.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <SubSystem>Console</SubSystem>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+</Project>\r
diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffDebugWinCairo.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffDebugWinCairo.props
new file mode 100644 (file)
index 0000000..3149171
--- /dev/null
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ImportGroup Label="PropertySheets">\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\debug.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\WinCairo.props" />\r
+    <Import Project="ImageDiffCommonWinCairo.props" />\r
+  </ImportGroup>\r
+</Project>\r
diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffReleaseWinCairo.props b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffReleaseWinCairo.props
new file mode 100644 (file)
index 0000000..c40d6a8
--- /dev/null
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ImportGroup Label="PropertySheets">\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\WinCairo.props" />\r
+    <Import Project="ImageDiffCommonWinCairo.props" />\r
+  </ImportGroup>\r
+</Project>\r