Changeset 146416 in webkit


Ignore:
Timestamp:
Mar 20, 2013, 5:08:39 PM (12 years ago)
Author:
bfulgham@webkit.org
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.
Location:
trunk/Tools
Files:
3 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r146402 r146416  
     12013-03-20  Brent Fulgham  <bfulgham@webkit.org>
     2
     3        [WinCairo] Unreviewed build fix for VS2010.
     4
     5        Had to add WinCairo-specific property sheets to deal with some
     6        library and path differences with the main Apple port.
     7
     8        * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj:
     9        * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeDebugWinCairo.props:
     10        * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeReleaseWinCairo.props:
     11        * DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffCommonWinCairo.props: Added.
     12        * DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffDebugWinCairo.props: Added.
     13        * DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffReleaseWinCairo.props: Added.
     14
    1152013-03-20  Benjamin Poulain  <bpoulain@apple.com>
    216
  • trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj

    r146398 r146416  
    9797    <ClCompile Include="..\..\cairo\PixelDumpSupportCairo.cpp">
    9898      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
    99       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
    10099      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
    101100      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    102       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
    103101      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
    104102    </ClCompile>
    105     <ClCompile Include="..\..\cg\PixelDumpSupportCG.cpp" />
     103    <ClCompile Include="..\..\cg\PixelDumpSupportCG.cpp">
     104      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
     105      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
     106    </ClCompile>
    106107    <ClCompile Include="..\..\CyclicRedundancyCheck.cpp" />
    107108    <ClCompile Include="..\..\DumpRenderTreeCommon.cpp" />
     
    137138    <ClInclude Include="..\..\cairo\PixelDumpSupportCairo.h">
    138139      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
    139       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
    140140      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
    141141      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    142       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
    143142      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
    144143    </ClInclude>
    145     <ClInclude Include="..\..\cg\PixelDumpSupportCG.h" />
     144    <ClInclude Include="..\..\cg\PixelDumpSupportCG.h">
     145      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
     146      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
     147    </ClInclude>
    146148    <ClInclude Include="..\..\config.h" />
    147149    <ClInclude Include="..\..\CyclicRedundancyCheck.h" />
  • trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeDebugWinCairo.props

    r146398 r146416  
    1010    <Import Project="DumpRenderTreeCommon.props" />
    1111  </ImportGroup>
     12  <ItemDefinitionGroup>
     13    <ClCompile>
     14      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\cairo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     15    </ClCompile>
     16  </ItemDefinitionGroup>
    1217</Project>
  • trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeReleaseWinCairo.props

    r146398 r146416  
    1010    <Import Project="DumpRenderTreeCommon.props" />
    1111  </ImportGroup>
     12  <ItemDefinitionGroup>
     13    <ClCompile>
     14      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\cairo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     15    </ClCompile>
     16  </ItemDefinitionGroup>
    1217</Project>
Note: See TracChangeset for help on using the changeset viewer.