Title: [151328] trunk/Source/WTF
- Revision
- 151328
- Author
- [email protected]
- Date
- 2013-06-07 11:20:09 -0700 (Fri, 07 Jun 2013)
Log Message
Unreviewed, rolling out r151318.
http://trac.webkit.org/changeset/151318
https://bugs.webkit.org/show_bug.cgi?id=117356
Broke Windows Release Build (Requested by bfulgham on
#webkit).
* WTF.vcxproj/WTF.vcxproj:
* WTF.vcxproj/WTFCommon.props:
* WTF.vcxproj/WTFCoreFoundation.props: Removed.
* WTF.vcxproj/WTFDebug.props:
* WTF.vcxproj/WTFRelease.props:
Modified Paths
Removed Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (151327 => 151328)
--- trunk/Source/WTF/ChangeLog 2013-06-07 17:59:01 UTC (rev 151327)
+++ trunk/Source/WTF/ChangeLog 2013-06-07 18:20:09 UTC (rev 151328)
@@ -1,3 +1,18 @@
+2013-06-07 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r151318.
+ http://trac.webkit.org/changeset/151318
+ https://bugs.webkit.org/show_bug.cgi?id=117356
+
+ Broke Windows Release Build (Requested by bfulgham on
+ #webkit).
+
+ * WTF.vcxproj/WTF.vcxproj:
+ * WTF.vcxproj/WTFCommon.props:
+ * WTF.vcxproj/WTFCoreFoundation.props: Removed.
+ * WTF.vcxproj/WTFDebug.props:
+ * WTF.vcxproj/WTFRelease.props:
+
2013-06-07 [email protected] <[email protected]>
[WinCairo] WTF.dll is linking with CoreFoundation.lib in VS2010.
Modified: trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj (151327 => 151328)
--- trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj 2013-06-07 17:59:01 UTC (rev 151327)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj 2013-06-07 18:20:09 UTC (rev 151328)
@@ -89,10 +89,7 @@
<ClCompile Include="..\wtf\win\MainThreadWin.cpp" />
<ClCompile Include="..\wtf\win\OwnPtrWin.cpp" />
<ClCompile Include="..\wtf\WTFThreadData.cpp" />
- <ClCompile Include="..\wtf\SchedulePairCF.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
- </ClCompile>
+ <ClCompile Include="..\wtf\SchedulePairCF.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\WTF\config.h" />
Modified: trunk/Source/WTF/WTF.vcxproj/WTFCommon.props (151327 => 151328)
--- trunk/Source/WTF/WTF.vcxproj/WTFCommon.props 2013-06-07 17:59:01 UTC (rev 151327)
+++ trunk/Source/WTF/WTF.vcxproj/WTFCommon.props 2013-06-07 18:20:09 UTC (rev 151328)
@@ -23,7 +23,7 @@
<OutputFile>$(OutDir)\$(TargetName).bsc</OutputFile>
</Bscmake>
<Link>
- <AdditionalDependencies>winmm.lib;libicuuc$(DebugSuffix).lib;libicuin$(DebugSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>winmm.lib;libicuuc$(DebugSuffix).lib;libicuin$(DebugSuffix).lib;CoreFoundation$(DebugSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
</Project>
\ No newline at end of file
Deleted: trunk/Source/WTF/WTF.vcxproj/WTFCoreFoundation.props (151327 => 151328)
--- trunk/Source/WTF/WTF.vcxproj/WTFCoreFoundation.props 2013-06-07 17:59:01 UTC (rev 151327)
+++ trunk/Source/WTF/WTF.vcxproj/WTFCoreFoundation.props 2013-06-07 18:20:09 UTC (rev 151328)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup />
- <ItemDefinitionGroup>
- <Bscmake />
- <Link>
- <AdditionalDependencies>CoreFoundation$(DebugSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
- </Link>
- </ItemDefinitionGroup>
-</Project>
Modified: trunk/Source/WTF/WTF.vcxproj/WTFDebug.props (151327 => 151328)
--- trunk/Source/WTF/WTF.vcxproj/WTFDebug.props 2013-06-07 17:59:01 UTC (rev 151327)
+++ trunk/Source/WTF/WTF.vcxproj/WTFDebug.props 2013-06-07 18:20:09 UTC (rev 151328)
@@ -5,7 +5,6 @@
<Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />
<Import Project="$(WebKit_Libraries)\tools32\vsprops\debug.props" />
<Import Project="WTFCommon.props" />
- <Import Project="WTFCoreFoundation.props" />
</ImportGroup>
<PropertyGroup />
<PropertyGroup />
Modified: trunk/Source/WTF/WTF.vcxproj/WTFRelease.props (151327 => 151328)
--- trunk/Source/WTF/WTF.vcxproj/WTFRelease.props 2013-06-07 17:59:01 UTC (rev 151327)
+++ trunk/Source/WTF/WTF.vcxproj/WTFRelease.props 2013-06-07 18:20:09 UTC (rev 151328)
@@ -5,7 +5,6 @@
<Import Project="$(WebKit_Libraries)\tools32\vsprops\common.props" />
<Import Project="$(WebKit_Libraries)\tools32\vsprops\release.props" />
<Import Project="WTFCommon.props" />
- <Import Project="WTFCoreFoundation.props" />
</ImportGroup>
<PropertyGroup />
<ItemDefinitionGroup>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
