From 7a03d7d7ea0cb442fd8fd8286fc6dd0f5d438341 Mon Sep 17 00:00:00 2001
From: "bfulgham@apple.com"
 <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon, 1 Jul 2013 18:12:31 +0000
Subject: [PATCH] [Windows] Unreviewed correction to DEBUG_ALL target.  Target
 was undefining DEBUG_ALL and DEBUG_INTERNAL, which prevented proper build
 operation.

* win/tools/vsprops/debugsuffix.props: We should DEFINE (not UNDEFINE) the DEBUG_ALL and DEBUG_INTERNAL
macros when building with 'debugsuffix' target.



git-svn-id: https://svn.webkit.org/repository/webkit/trunk@152233 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 WebKitLibraries/ChangeLog                           | 8 ++++++++
 WebKitLibraries/win/tools/vsprops/debugsuffix.props | 8 +++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index b0f6094..71136ff 100644
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,11 @@
+2013-07-01  Brent Fulgham  <bfulgham@apple.com>
+
+        [Windows] Unreviewed correction to DEBUG_ALL target.  Target was undefining DEBUG_ALL and DEBUG_INTERNAL,
+        which prevented proper build operation.
+
+        * win/tools/vsprops/debugsuffix.props: We should DEFINE (not UNDEFINE) the DEBUG_ALL and DEBUG_INTERNAL
+        macros when building with 'debugsuffix' target.
+
 2013-06-18  Roger Fong  <roger_fong@apple.com>
 
         Replace tools32 folder with tools and update WebKit Windows solution accordingly.
diff --git a/WebKitLibraries/win/tools/vsprops/debugsuffix.props b/WebKitLibraries/win/tools/vsprops/debugsuffix.props
index a435665..dbab43f 100644
--- a/WebKitLibraries/win/tools/vsprops/debugsuffix.props
+++ b/WebKitLibraries/win/tools/vsprops/debugsuffix.props
@@ -8,16 +8,18 @@
     <TargetName>$(TargetName)$(DebugSuffix)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup>
-    <ClCompile>
-      <UndefinePreprocessorDefinitions>DEBUG_INTERNAL;DEBUG_ALL;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
-    </ClCompile>
+    <ClCompile />
     <Lib>
       <OutputFile>$(OutDir)\$(ProjectName)$(DebugSuffix).lib</OutputFile>
     </Lib>
+    <ClCompile>
+      <PreprocessorDefinitions>DEBUG_INTERNAL;DEBUG_ALL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
     <BuildMacro Include="DebugSuffix">
       <Value>$(DebugSuffix)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
     </BuildMacro>
   </ItemGroup>
 </Project>
\ No newline at end of file
-- 
1.8.3.1