Title: [146231] trunk/Source/WebCore
- Revision
- 146231
- Author
- bfulg...@webkit.org
- Date
- 2013-03-19 11:59:49 -0700 (Tue, 19 Mar 2013)
Log Message
[WinCairo] Unreviewed build correction for WebCore library.
* WebCore.vcxproj/WebCore.vcxproj: Exclude CG-specific frame source
from WinCairo build.
* WebCore.vcxproj/WebCoreGeneratedWinCairo.make: Pass correct
parameter to build-generated-files.sh for WinCairo build.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (146230 => 146231)
--- trunk/Source/WebCore/ChangeLog 2013-03-19 18:50:22 UTC (rev 146230)
+++ trunk/Source/WebCore/ChangeLog 2013-03-19 18:59:49 UTC (rev 146231)
@@ -1,3 +1,12 @@
+2013-03-19 Brent Fulgham <bfulg...@webkit.org>
+
+ [WinCairo] Unreviewed build correction for WebCore library.
+
+ * WebCore.vcxproj/WebCore.vcxproj: Exclude CG-specific frame source
+ from WinCairo build.
+ * WebCore.vcxproj/WebCoreGeneratedWinCairo.make: Pass correct
+ parameter to build-generated-files.sh for WinCairo build.
+
2013-03-19 Leon Scroggins <scro...@chromium.org>
Implement onRefEncodedData for lazy pixel refs.
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (146230 => 146231)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-03-19 18:50:22 UTC (rev 146230)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-03-19 18:59:49 UTC (rev 146231)
@@ -3965,13 +3965,14 @@
<ClCompile Include="..\page\WorkerNavigator.cpp" />
<ClCompile Include="..\page\win\FrameCairoWin.cpp">
<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>
<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>
</ClCompile>
- <ClCompile Include="..\page\win\FrameCGWin.cpp" />
+ <ClCompile Include="..\page\win\FrameCGWin.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="..\page\win\FrameWin.cpp" />
<ClCompile Include="..\loader\CachedMetadata.cpp" />
<ClCompile Include="..\loader\CookieJar.cpp" />
@@ -13640,4 +13641,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedWinCairo.make (146230 => 146231)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedWinCairo.make 2013-03-19 18:50:22 UTC (rev 146230)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedWinCairo.make 2013-03-19 18:59:49 UTC (rev 146231)
@@ -3,7 +3,7 @@
if errorlevel 1 exit 1
echo XXWebCoreGeneratedXX > "%ConfigurationBuildDir%\buildfailed"
- bash build-generated-files.sh "%ConfigurationBuildDir%" "%WebKit_Libraries%" windows
+ bash build-generated-files.sh "%ConfigurationBuildDir%" "%WebKit_Libraries%" cairo
bash migrate-scripts.sh "%ConfigurationBuildDir%\obj\WebCore\scripts"
cmd /C copyForwardingHeaders.cmd cairo curl
cmd /C copyWebCoreResourceFiles.cmd
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
