From d8fa49ae3519060d53256d15472d1f45aa7651aa Mon Sep 17 00:00:00 2001
From: "roger_fong@apple.com"
 <roger_fong@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri, 19 Jul 2013 00:35:57 +0000
Subject: [PATCH] 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
---
 Source/ThirdParty/ChangeLog                         | 7 +++++++
 Source/ThirdParty/gtest/msvc/gtest-md.vcxproj       | 1 -
 WebKitLibraries/ChangeLog                           | 7 +++++++
 WebKitLibraries/win/tools/vsprops/debugsuffix.props | 3 ++-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Source/ThirdParty/ChangeLog b/Source/ThirdParty/ChangeLog
index 7fc2826327ff..34f479469054 100644
--- 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 d5d06469ec96..826abb77f352 100644
--- a/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj
+++ b/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj
@@ -133,7 +133,6 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\Include;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\JavaScriptCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index e494ee22df39..c67ada5601ac 100644
--- 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 a435665f9232..ec24733b964d 100644
--- a/WebKitLibraries/win/tools/vsprops/debugsuffix.props
+++ b/WebKitLibraries/win/tools/vsprops/debugsuffix.props
@@ -9,7 +9,8 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <UndefinePreprocessorDefinitions>DEBUG_INTERNAL;DEBUG_ALL;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
+      <PreprocessorDefinitions>_CONSOLE;DEBUG_INTERNAL;DEBUG_ALL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     </ClCompile>
     <Lib>
       <OutputFile>$(OutDir)\$(ProjectName)$(DebugSuffix).lib</OutputFile>
-- 
2.36.0