Title: [178431] trunk/Source/WebKit
- Revision
- 178431
- Author
- bfulg...@apple.com
- Date
- 2015-01-14 11:08:29 -0800 (Wed, 14 Jan 2015)
Log Message
[Win] Unreviewed build fix for DebugSuffix target.
* WebKit.vcxproj/WebKit/WebKit.vcxproj: Correct build flags for DebugSuffix
target to match Release and Debug builds.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (178430 => 178431)
--- trunk/Source/WebKit/ChangeLog 2015-01-14 19:03:28 UTC (rev 178430)
+++ trunk/Source/WebKit/ChangeLog 2015-01-14 19:08:29 UTC (rev 178431)
@@ -1,5 +1,12 @@
2015-01-14 Brent Fulgham <bfulg...@apple.com>
+ [Win] Unreviewed build fix for DebugSuffix target.
+
+ * WebKit.vcxproj/WebKit/WebKit.vcxproj: Correct build flags for DebugSuffix
+ target to match Release and Debug builds.
+
+2015-01-14 Brent Fulgham <bfulg...@apple.com>
+
[Win] Build fix after r178255.
Correct path to PaintHooks.asm. This causes a build failure if you perform a
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj (178430 => 178431)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj 2015-01-14 19:03:28 UTC (rev 178430)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj 2015-01-14 19:08:29 UTC (rev 178431)
@@ -119,7 +119,7 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
- <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
+ <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -608,17 +608,18 @@
<ItemGroup>
<ResourceCompile Include="..\..\win\WebKit.resources\WebKit.rc" />
</ItemGroup>
- <ItemGroup>
+ <ItemGroup>
<MASM Include="..\..\win\Plugins\PaintHooks.asm">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
- </MASM>
- </ItemGroup>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ </MASM>
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
- <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
+ <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
</ImportGroup>
</Project>
\ No newline at end of file
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
