Title: [152982] trunk/Source
Revision
152982
Author
[email protected]
Date
2013-07-22 11:12:12 -0700 (Mon, 22 Jul 2013)

Log Message

Added assembly files to Windows 64-bit builds.
https://bugs.webkit.org/show_bug.cgi?id=118931

Reviewed by Brent Fulgham.

Source/_javascript_Core:

* _javascript_Core.vcxproj/_javascript_Core.vcxproj: Added JITStubsMSVC64.asm for x64 and enabled MASM.
* _javascript_Core.vcxproj/_javascript_Core.vcxproj.filters: Added JITStubsMSVC64.asm.

Source/WebCore:

* WebCore.vcxproj/WebCore.vcxproj: Added PaintHooks.asm for x64 and enabled MASM.
* WebCore.vcxproj/WebCore.vcxproj.filters: Added PaintHooks.asm.

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (152981 => 152982)


--- trunk/Source/_javascript_Core/ChangeLog	2013-07-22 18:10:48 UTC (rev 152981)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-07-22 18:12:12 UTC (rev 152982)
@@ -1,3 +1,13 @@
+2013-07-22  Alex Christensen  <[email protected]>
+
+        Added assembly files to Windows 64-bit builds.
+        https://bugs.webkit.org/show_bug.cgi?id=118931
+
+        Reviewed by Brent Fulgham.
+
+        * _javascript_Core.vcxproj/_javascript_Core.vcxproj: Added JITStubsMSVC64.asm for x64 and enabled MASM.
+        * _javascript_Core.vcxproj/_javascript_Core.vcxproj.filters: Added JITStubsMSVC64.asm.
+
 2013-07-20  Brent Fulgham  <[email protected]>
 
         [Windows] Remove unneeded custom stdint.h now that we build on VS2010.

Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj (152981 => 152982)


--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj	2013-07-22 18:10:48 UTC (rev 152981)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj	2013-07-22 18:12:12 UTC (rev 152982)
@@ -119,6 +119,7 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -914,7 +915,17 @@
       <FileType>Document</FileType>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <MASM Include="..\jit\JITStubsMSVC64.asm">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+    </MASM>
+  </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: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj.filters (152981 => 152982)


--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj.filters	2013-07-22 18:10:48 UTC (rev 152981)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj.filters	2013-07-22 18:12:12 UTC (rev 152982)
@@ -1932,4 +1932,9 @@
     <None Include="_javascript_CorePostBuild.cmd" />
     <None Include="_javascript_CorePreBuild.cmd" />
   </ItemGroup>
+  <ItemGroup>
+    <MASM Include="..\jit\JITStubsMSVC64.asm">
+      <Filter>jit</Filter>
+    </MASM>
+  </ItemGroup>
 </Project>
\ No newline at end of file

Modified: trunk/Source/WebCore/ChangeLog (152981 => 152982)


--- trunk/Source/WebCore/ChangeLog	2013-07-22 18:10:48 UTC (rev 152981)
+++ trunk/Source/WebCore/ChangeLog	2013-07-22 18:12:12 UTC (rev 152982)
@@ -1,3 +1,13 @@
+2013-07-22  Alex Christensen  <[email protected]>
+
+        Added assembly files to Windows 64-bit builds.
+        https://bugs.webkit.org/show_bug.cgi?id=118931
+
+        Reviewed by Brent Fulgham.
+
+        * WebCore.vcxproj/WebCore.vcxproj: Added PaintHooks.asm for x64 and enabled MASM.
+        * WebCore.vcxproj/WebCore.vcxproj.filters: Added PaintHooks.asm.
+
 2013-07-22  Jakob Petsovits  <[email protected]>
 
         [BlackBerry] Fix WebGL to a 2D canvas copies.

Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (152981 => 152982)


--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj	2013-07-22 18:10:48 UTC (rev 152981)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj	2013-07-22 18:12:12 UTC (rev 152982)
@@ -106,6 +106,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" />
@@ -21383,7 +21384,17 @@
     <None Include="WebCorePostBuild.cmd" />
     <None Include="WebCorePreBuild.cmd" />
   </ItemGroup>
+  <ItemGroup>
+    <MASM Include="..\plugins\win\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>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
   </ImportGroup>
 </Project>
\ No newline at end of file

Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (152981 => 152982)


--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters	2013-07-22 18:10:48 UTC (rev 152981)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters	2013-07-22 18:12:12 UTC (rev 152982)
@@ -15779,4 +15779,9 @@
       <Filter>rendering</Filter>
     </CustomBuildStep>
   </ItemGroup>
+  <ItemGroup>
+    <MASM Include="..\plugins\win\PaintHooks.asm">
+      <Filter>plugins\win</Filter>
+    </MASM>
+  </ItemGroup>
 </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