Title: [171604] branches/safari-600.1-branch/Source/_javascript_Core
- Revision
- 171604
- Author
- [email protected]
- Date
- 2014-07-25 10:53:51 -0700 (Fri, 25 Jul 2014)
Log Message
Merged r171578. <rdar://problem/17811466>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/_javascript_Core/ChangeLog (171603 => 171604)
--- branches/safari-600.1-branch/Source/_javascript_Core/ChangeLog 2014-07-25 17:52:25 UTC (rev 171603)
+++ branches/safari-600.1-branch/Source/_javascript_Core/ChangeLog 2014-07-25 17:53:51 UTC (rev 171604)
@@ -1,3 +1,18 @@
+2014-07-25 Lucas Forschler <[email protected]>
+
+ Merge r171578
+
+ 2014-07-24 Brent Fulgham <[email protected]>
+
+ [Win] Correct build order in _javascript_Core.submit.sln
+ https://bugs.webkit.org/show_bug.cgi?id=135282
+ <rdar://problem/17805592>
+
+ Unreviewed build fix.
+
+ * _javascript_Core.vcxproj/_javascript_Core.submit.sln: Correct build order
+ such that LLIntDesiredOffset is built prior to the rest of JSC.
+
2014-07-24 Lucas Forschler <[email protected]>
Merge r171564
Modified: branches/safari-600.1-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.submit.sln (171603 => 171604)
--- branches/safari-600.1-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.submit.sln 2014-07-25 17:52:25 UTC (rev 171603)
+++ branches/safari-600.1-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.submit.sln 2014-07-25 17:53:51 UTC (rev 171604)
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2013 for Windows Desktop
+# Visual Studio 2013
VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_javascript_Core", "_javascript_Core.vcxproj", "{22413D41-3A18-42B7-92A8-CEDC6CE86920}"
@@ -32,6 +32,9 @@
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LLIntDesiredOffsets", "LLInt\LLIntDesiredOffsets\LLIntDesiredOffsets.vcxproj", "{877150A0-41B3-4730-9D98-1B8298098B14}"
+ ProjectSection(ProjectDependencies) = postProject
+ {3670D01F-95F3-45A8-B878-947EB6CF214E} = {3670D01F-95F3-45A8-B878-947EB6CF214E}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LLIntOffsetsExtractor", "LLInt\LLIntOffsetsExtractor\LLIntOffsetsExtractor.vcxproj", "{D595E3F6-24F2-4C60-935C-95D50C6B3E96}"
ProjectSection(ProjectDependencies) = postProject
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
