Title: [148529] trunk/Source/WebKit
- Revision
- 148529
- Author
- [email protected]
- Date
- 2013-04-16 11:54:31 -0700 (Tue, 16 Apr 2013)
Log Message
../WebKit: [Windows] Unreviewed VS2010 build correction.
* WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorCommon.props:
Add correct link library to avoid mixture of ICU 4.0 and 4.6
syumbol use.
../WebKit/win: [Windows] Unreviewed build correction.
* WebKit.vcproj/WebKitExportGeneratorCommon.vsprops: Add correct
ICU link library to avoid mixture of ICU 4.0 and 4.6 symbols
during link.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (148528 => 148529)
--- trunk/Source/WebKit/ChangeLog 2013-04-16 18:50:00 UTC (rev 148528)
+++ trunk/Source/WebKit/ChangeLog 2013-04-16 18:54:31 UTC (rev 148529)
@@ -1,3 +1,11 @@
+2013-04-16 Brent Fulgham <[email protected]>
+
+ [Windows] Unreviewed VS2010 build correction.
+
+ * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorCommon.props:
+ Add correct link library to avoid mixture of ICU 4.0 and 4.6
+ syumbol use.
+
2013-04-12 Jer Noble <[email protected]>
TimeRanges::nearest() returns incorrect results.
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorCommon.props (148528 => 148529)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorCommon.props 2013-04-16 18:50:00 UTC (rev 148528)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorCommon.props 2013-04-16 18:54:31 UTC (rev 148529)
@@ -10,7 +10,7 @@
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
- <AdditionalDependencies>WTF$(DebugSuffix).lib;pthreadVC2.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>WTF$(DebugSuffix).lib;libicuuc.lib;pthreadVC2.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
Modified: trunk/Source/WebKit/win/ChangeLog (148528 => 148529)
--- trunk/Source/WebKit/win/ChangeLog 2013-04-16 18:50:00 UTC (rev 148528)
+++ trunk/Source/WebKit/win/ChangeLog 2013-04-16 18:54:31 UTC (rev 148529)
@@ -1,3 +1,11 @@
+2013-04-16 Brent Fulgham <[email protected]>
+
+ [Windows] Unreviewed build correction.
+
+ * WebKit.vcproj/WebKitExportGeneratorCommon.vsprops: Add correct
+ ICU link library to avoid mixture of ICU 4.0 and 4.6 symbols
+ during link.
+
2013-04-15 [email protected] <[email protected]>
Crash when favicon is requested
Modified: trunk/Source/WebKit/win/WebKit.vcproj/WebKitExportGeneratorCommon.vsprops (148528 => 148529)
--- trunk/Source/WebKit/win/WebKit.vcproj/WebKitExportGeneratorCommon.vsprops 2013-04-16 18:50:00 UTC (rev 148528)
+++ trunk/Source/WebKit/win/WebKit.vcproj/WebKitExportGeneratorCommon.vsprops 2013-04-16 18:54:31 UTC (rev 148529)
@@ -11,7 +11,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="WTF$(WebKitConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib winmm.lib"
+ AdditionalDependencies="WTF$(WebKitConfigSuffix).lib libicuuc.lib pthreadVC2$(LibraryConfigSuffix).lib winmm.lib"
SubSystem="1"
/>
</VisualStudioPropertySheet>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
