[webkit-changes] [156202] branches/safari-537.60-branch/Source/WebCore

Fri, 20 Sep 2013 14:54:22 -0700

Title: [156202] branches/safari-537.60-branch/Source/WebCore
Revision
156202
Author
[email protected]
Date
2013-09-20 14:54:42 -0700 (Fri, 20 Sep 2013)

Log Message

Correct build by activating Microsoft Assembler support in
project file. I have no idea why this would be missing in
the branch.

Patch by Brent Fulgham <[email protected]> on 2013-09-20

* WebCore.vcxproj/WebCore.vcxproj: Activate MASM support.
* WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.

Modified Paths

Diff

Modified: branches/safari-537.60-branch/Source/WebCore/ChangeLog (156201 => 156202)


--- branches/safari-537.60-branch/Source/WebCore/ChangeLog	2013-09-20 21:47:47 UTC (rev 156201)
+++ branches/safari-537.60-branch/Source/WebCore/ChangeLog	2013-09-20 21:54:42 UTC (rev 156202)
@@ -1,3 +1,12 @@
+2013-09-20  Brent Fulgham  <[email protected]>
+
+        Correct build by activating Microsoft Assembler support in
+        project file. I have no idea why this would be missing in
+        the branch.
+
+        * WebCore.vcxproj/WebCore.vcxproj: Activate MASM support.
+        * WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
+
 2013-09-17  Lucas Forschler  <[email protected]>
 
         Merge r154391

Modified: branches/safari-537.60-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (156201 => 156202)


--- branches/safari-537.60-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj	2013-09-20 21:47:47 UTC (rev 156201)
+++ branches/safari-537.60-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj	2013-09-20 21:54:42 UTC (rev 156202)
@@ -58,6 +58,7 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
+    <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" />
@@ -13582,5 +13583,6 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
   </ImportGroup>
 </Project>
\ No newline at end of file

Modified: branches/safari-537.60-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (156201 => 156202)


--- branches/safari-537.60-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters	2013-09-20 21:47:47 UTC (rev 156201)
+++ branches/safari-537.60-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters	2013-09-20 21:54:42 UTC (rev 156202)
@@ -6787,7 +6787,6 @@
     <ClCompile Include="..\page\CaptionUserPreferencesMediaAF.cpp">
       <Filter>page</Filter>
     </ClCompile>
-    <ClCompile Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\JSSVGGraphicsElement.cpp" />
     <ClCompile Include="..\platform\graphics\avfoundation\cf\InbandTextTrackPrivateAVCF.cpp">
       <Filter>platform\graphics\avfoundation\cf</Filter>
     </ClCompile>
@@ -6797,19 +6796,16 @@
     <ClCompile Include="..\platform\graphics\avfoundation\cf\InbandTextTrackPrivateLegacyAVCF.cpp">
       <Filter>platform\graphics\avfoundation\cf</Filter>
     </ClCompile>
-    <ClCompile Include="..\rendering\RenderBlockFlow.cpp" /> 
-    <ClCompile Include="..\platform\win\StructuredExceptionHandlerSuppressor.cpp"> 
-      <Filter>platform\win</Filter> 
+    <ClCompile Include="..\platform\win\StructuredExceptionHandlerSuppressor.cpp">
+      <Filter>platform\win</Filter>
     </ClCompile>
-    <ClCompile Include="..\dom\ElementData.cpp" />
-    <ClCompile Include="..\dom\InlineStyleSheetOwner.cpp" />
-    <ClCompile Include="..\dom\TextNodeTraversal.cpp" />
     <ClCompile Include="..\css\CSSImageSetValue.cpp">
       <Filter>css</Filter>
     </ClCompile>
     <ClCompile Include="..\rendering\style\StyleCachedImageSet.cpp">
       <Filter>rendering\style</Filter>
     </ClCompile>
+    <ClCompile Include="..\dom\StyleElement.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\Modules\filesystem\AsyncFileWriter.h">
@@ -14284,17 +14280,13 @@
     <ClInclude Include="..\platform\graphics\avfoundation\cf\InbandTextTrackPrivateLegacyAVCF.h">
       <Filter>platform\graphics\avfoundation\cf</Filter>
     </ClInclude>
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\HTMLElementTypeHelpers.h" />
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\SVGElementTypeHelpers.h" />
-    <ClInclude Include="..\dom\ElementData.h" />
-    <ClInclude Include="..\dom\InlineStyleSheetOwner.h" />
-    <ClInclude Include="..\dom\TextNodeTraversal.h" />
     <ClInclude Include="..\css\CSSImageSetValue.h">
       <Filter>css</Filter>
     </ClInclude>
     <ClInclude Include="..\rendering\style\StyleCachedImageSet.h">
       <Filter>rendering\style</Filter>
     </ClInclude>
+    <ClInclude Include="..\dom\StyleElement.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\css\CSSGrammar.y.in">
@@ -15244,4 +15236,4 @@
       <Filter>platform\win</Filter>
     </MASM>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to