Title: [172684] branches/safari-600.1-branch/WebKitLibraries
- Revision
- 172684
- Author
- matthew_han...@apple.com
- Date
- 2014-08-15 21:21:49 -0700 (Fri, 15 Aug 2014)
Log Message
Merge r172661. <rdar://problem/18037766>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/WebKitLibraries/ChangeLog (172683 => 172684)
--- branches/safari-600.1-branch/WebKitLibraries/ChangeLog 2014-08-16 04:19:44 UTC (rev 172683)
+++ branches/safari-600.1-branch/WebKitLibraries/ChangeLog 2014-08-16 04:21:49 UTC (rev 172684)
@@ -1,5 +1,20 @@
2014-08-15 Matthew Hanson <matthew_han...@apple.com>
+ Merge r172661. <rdar://problem/18037766>
+
+ 2014-08-15 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Link to static VS2013 runtime library.
+ https://bugs.webkit.org/show_bug.cgi?id=136007
+ <rdar://problem/18037766>
+
+ Reviewed by Dean Jackson.
+
+ * win/tools/vsprops/common.props: Update link command.
+ * win/tools/vsprops/debugsuffix.props: Ditto.
+
+2014-08-15 Matthew Hanson <matthew_han...@apple.com>
+
Merge r172019. <rdar://problem/18029617>
2014-08-04 Matthew Hanson <matthew_han...@apple.com>
Modified: branches/safari-600.1-branch/WebKitLibraries/win/tools/vsprops/common.props (172683 => 172684)
--- branches/safari-600.1-branch/WebKitLibraries/win/tools/vsprops/common.props 2014-08-16 04:19:44 UTC (rev 172683)
+++ branches/safari-600.1-branch/WebKitLibraries/win/tools/vsprops/common.props 2014-08-16 04:21:49 UTC (rev 172684)
@@ -47,7 +47,7 @@
<TreatWarningAsError>false</TreatWarningAsError>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4018;4068;4099;4100;4127;4138;4146;4180;4189;4201;4244;4251;4267;4275;4288;4291;4305;4309;4344;4355;4389;4396;4481;4503;4505;4510;4512;4530;4610;4702;4706;4800;4819;4951;4952;4996;6011;6031;6211;6246;6255;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>false</FunctionLevelLinking>
<FloatingPointExceptions>false</FloatingPointExceptions>
<OpenMPSupport>false</OpenMPSupport>
Modified: branches/safari-600.1-branch/WebKitLibraries/win/tools/vsprops/debugsuffix.props (172683 => 172684)
--- branches/safari-600.1-branch/WebKitLibraries/win/tools/vsprops/debugsuffix.props 2014-08-16 04:19:44 UTC (rev 172683)
+++ branches/safari-600.1-branch/WebKitLibraries/win/tools/vsprops/debugsuffix.props 2014-08-16 04:21:49 UTC (rev 172684)
@@ -11,7 +11,7 @@
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>_CONSOLE;DEBUG_INTERNAL;DEBUG_ALL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Lib>
<OutputFile>$(OutDir)\$(ProjectName)$(DebugSuffix).lib</OutputFile>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
