Title: [146420] trunk/Tools
- Revision
- 146420
- Author
- bfulg...@webkit.org
- Date
- 2013-03-20 17:36:16 -0700 (Wed, 20 Mar 2013)
Log Message
[WinCairo] Unreviewed build fix for TestWebKitAPI under VS2010
* TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPICommonWinCairo.props: Added.
New property sheet that does not link against CoreFoundation and
CFNetwork.
* TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIDebugWinCairo.props:
Use new TestWebKitAPICommonWinCairo property sheet.
* TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIReleaseWinCairo.props:
Ditto.
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/ChangeLog (146419 => 146420)
--- trunk/Tools/ChangeLog 2013-03-21 00:31:45 UTC (rev 146419)
+++ trunk/Tools/ChangeLog 2013-03-21 00:36:16 UTC (rev 146420)
@@ -1,5 +1,17 @@
2013-03-20 Brent Fulgham <bfulg...@webkit.org>
+ [WinCairo] Unreviewed build fix for TestWebKitAPI under VS2010
+
+ * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPICommonWinCairo.props: Added.
+ New property sheet that does not link against CoreFoundation and
+ CFNetwork.
+ * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIDebugWinCairo.props:
+ Use new TestWebKitAPICommonWinCairo property sheet.
+ * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIReleaseWinCairo.props:
+ Ditto.
+
+2013-03-20 Brent Fulgham <bfulg...@webkit.org>
+
[WinCairo] Unreviewed build fix for VS2010.
Had to add WinCairo-specific property sheets to deal with some
Added: trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPICommonWinCairo.props (0 => 146420)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPICommonWinCairo.props (rev 0)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPICommonWinCairo.props 2013-03-21 00:36:16 UTC (rev 146420)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets" />
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup />
+ <ItemDefinitionGroup>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <AdditionalDependencies>CFLite.lib;WebKit.lib;_javascript_Core.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <ClCompile>
+ <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\win;$(ConfigurationBuildDir)\Include;$(ConfigurationBuildDir)\Include\private\_javascript_Core;$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\Include\private;$(WebKit_Source)\ThirdParty\gtest\include;$(WebKit_Libraries)\include;$(WebKit_Libraries)\Include\private;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemGroup />
+</Project>
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIDebugWinCairo.props (146419 => 146420)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIDebugWinCairo.props 2013-03-21 00:31:45 UTC (rev 146419)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIDebugWinCairo.props 2013-03-21 00:36:16 UTC (rev 146420)
@@ -4,7 +4,9 @@
<Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefinesCairo.props" />
<Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />
<Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\debug.props" />
- <Import Project="TestWebKitAPICommon.props" />
+ <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\WinCairo.props" />
+ <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\WebKit\cURL.props" />
+ <Import Project="TestWebKitAPICommonWinCairo.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIReleaseWinCairo.props (146419 => 146420)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIReleaseWinCairo.props 2013-03-21 00:31:45 UTC (rev 146419)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIReleaseWinCairo.props 2013-03-21 00:36:16 UTC (rev 146420)
@@ -4,7 +4,9 @@
<Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\FeatureDefinesCairo.props" />
<Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />
<Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />
- <Import Project="TestWebKitAPICommon.props" />
+ <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\WinCairo.props" />
+ <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\WebKit\cURL.props" />
+ <Import Project="TestWebKitAPICommonWinCairo.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
