[Win] Link to static VS2013 runtime library.
authorbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 16 Aug 2014 00:42:24 +0000 (00:42 +0000)
committerbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 16 Aug 2014 00:42:24 +0000 (00:42 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@172661 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKitLibraries/ChangeLog
WebKitLibraries/win/tools/vsprops/common.props
WebKitLibraries/win/tools/vsprops/debugsuffix.props

index f8cf581..0d8dac7 100644 (file)
@@ -1,3 +1,14 @@
+2014-08-15  Brent Fulgham  <bfulgham@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-14  Brent Fulgham  <bfulgham@apple.com>
 
         [Win] Extend auto-version and version-stamp for RC_ProjectBuildVersion
index 02267b4..00df641 100644 (file)
@@ -47,7 +47,7 @@ nmake /nologo -f $(ProjectName).make clean</NMakeCleanCommandLine>
       <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>
index 3ba2e67..1394f18 100644 (file)
@@ -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>