[WinCairo] Link error.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 27 Aug 2014 19:37:16 +0000 (19:37 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 27 Aug 2014 19:37:16 +0000 (19:37 +0000)
https://bugs.webkit.org/show_bug.cgi?id=136286

Patch by peavo@outlook.com <peavo@outlook.com> on 2014-08-27
Reviewed by Darin Adler.

Link with the dynamic runtime libraries, since the WinCairo libraries link with these.

* win/tools/vsprops/common.props:

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

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

index 908d892..b1f24f7 100644 (file)
@@ -1,3 +1,14 @@
+2014-08-27  peavo@outlook.com  <peavo@outlook.com>
+
+        [WinCairo] Link error.
+        https://bugs.webkit.org/show_bug.cgi?id=136286
+
+        Reviewed by Darin Adler.
+
+        Link with the dynamic runtime libraries, since the WinCairo libraries link with these.
+
+        * win/tools/vsprops/common.props:
+
 2014-08-26  Brent Fulgham  <bfulgham@apple.com>
 
         [Win] Version stamp should include package-level version
index fd321cc..2747f5f 100644 (file)
@@ -50,6 +50,7 @@ nmake /nologo -f $(ProjectName).make clean</NMakeCleanCommandLine>
       <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>MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary Condition="$(Configuration)=='Release_WinCairo' or $(Configuration)=='Debug_WinCairo'">MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>false</FunctionLevelLinking>
       <FloatingPointExceptions>false</FloatingPointExceptions>
       <OpenMPSupport>false</OpenMPSupport>