Make sure to link against _debug binaries when appropriate.

<rdar://problem/14473010>.

* win/tools/vsprops/debugsuffix.props:
* gtest/msvc/gtest-md.vcxproj:

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

diff --git a/Source/ThirdParty/ChangeLog b/Source/ThirdParty/ChangeLog
index 7fc2826327ffd6cad7cb49881efaa17c99f2df69..34f47946905436caca1180f791f09ac9f60885f2 100644 (file)
--- a/Source/ThirdParty/ChangeLog
+++ b/Source/ThirdParty/ChangeLog
@@ -1,3 +1,10 @@
+2013-07-18  Roger Fong  <roger_fong@apple.com>
+
+        Make sure to link against _debug binaries when appropriate.
+        <rdar://problem/14473010>.
+
+        * gtest/msvc/gtest-md.vcxproj:
+
 2013-06-17  Darin Adler  <darin@apple.com>
 
         Sort all the Xcode project files

diff --git a/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj b/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj
index d5d06469ec962448c1cb4116a00902c44863c446..826abb77f352808b2d6be3d80a532448e6155a26 100644 (file)
--- a/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj
+++ b/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj
@@ -133,7 +133,6 @@
       <Optimization>Disabled</Optimization>\r
       <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\Include;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\JavaScriptCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index e494ee22df39b0f2248e95ff6dd4b755b401d838..c67ada5601acc513b44c4b4b1b023d3790b79e8d 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,10 @@
+2013-07-18  Roger Fong  <roger_fong@apple.com>
+
+        Make sure to link against _debug binaries when appropriate.
+        <rdar://problem/14473010>.
+
+        * win/tools/vsprops/debugsuffix.props:
+
 2013-07-02  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r152233.

diff --git a/WebKitLibraries/win/tools/vsprops/debugsuffix.props b/WebKitLibraries/win/tools/vsprops/debugsuffix.props
index a435665f9232d9234ab4c6c56a03a9e908b84da9..ec24733b964db6d19d772dbe8fe4d7e2c2e32029 100644 (file)
--- a/WebKitLibraries/win/tools/vsprops/debugsuffix.props
+++ b/WebKitLibraries/win/tools/vsprops/debugsuffix.props
@@ -9,7 +9,8 @@
   </PropertyGroup>\r
   <ItemDefinitionGroup>\r
     <ClCompile>\r
-      <UndefinePreprocessorDefinitions>DEBUG_INTERNAL;DEBUG_ALL;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_CONSOLE;DEBUG_INTERNAL;DEBUG_ALL;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
     </ClCompile>\r
     <Lib>\r
       <OutputFile>$(OutDir)\$(ProjectName)$(DebugSuffix).lib</OutputFile>\r