Title: [152546] branches/safari-537-branch/Source/WTF
- Revision
- 152546
- Author
- [email protected]
- Date
- 2013-07-10 13:46:02 -0700 (Wed, 10 Jul 2013)
Log Message
Merged r152429. <rdar://problem/14341205>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WTF/ChangeLog (152545 => 152546)
--- branches/safari-537-branch/Source/WTF/ChangeLog 2013-07-10 20:44:00 UTC (rev 152545)
+++ branches/safari-537-branch/Source/WTF/ChangeLog 2013-07-10 20:46:02 UTC (rev 152546)
@@ -1,5 +1,16 @@
2013-07-10 Lucas Forschler <[email protected]>
+ Merge r152429
+
+ 2013-07-05 Brent Fulgham <[email protected]>
+
+ [Windows] Unreviewed build correction.
+
+ * WTF.vcxproj/WTFGenerated.make: Avoid syntax error in generated
+ file in cases where Legible Output support is not present.
+
+2013-07-10 Lucas Forschler <[email protected]>
+
Merge r152427
2013-07-05 Brent Fulgham <[email protected]>
Modified: branches/safari-537-branch/Source/WTF/WTF.vcxproj/WTFGenerated.make (152545 => 152546)
--- branches/safari-537-branch/Source/WTF/WTF.vcxproj/WTFGenerated.make 2013-07-10 20:44:00 UTC (rev 152545)
+++ branches/safari-537-branch/Source/WTF/WTF.vcxproj/WTFGenerated.make 2013-07-10 20:46:02 UTC (rev 152546)
@@ -17,7 +17,6 @@
WTFHeaderDetection.h: WTFGenerated.make
-mkdir "%ConfigurationBuildDir%\include\private\wtf
<<testOSXLevel.cmd
-IF EXIST "%ConfigurationBuildDir%\include\private\wtf\$@" exit
-echo > "%ConfigurationBuildDir%\include\private\wtf\$@"
+echo /* No Legible Output Support Found */ > "%ConfigurationBuildDir%\include\private\wtf\$@"
IF EXIST "$(WEBKIT_LIBRARIES)/include/AVFoundationCF/AVCFPlayerItemLegibleOutput.h" (echo #define __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ 1090 > "%ConfigurationBuildDir%\include\private\wtf\$@")
<<
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
