[Windows] Unreviewed correction to DEBUG_ALL target. Target was undefining DEBUG_ALL...
authorbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 1 Jul 2013 18:12:31 +0000 (18:12 +0000)
committerbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 1 Jul 2013 18:12:31 +0000 (18:12 +0000)
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
WebKitLibraries/win/tools/vsprops/debugsuffix.props

index b0f6094..71136ff 100644 (file)
@@ -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.
index a435665..dbab43f 100644 (file)
@@ -8,16 +8,18 @@
     <TargetName>$(TargetName)$(DebugSuffix)</TargetName>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup>\r
-    <ClCompile>\r
-      <UndefinePreprocessorDefinitions>DEBUG_INTERNAL;DEBUG_ALL;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>\r
-    </ClCompile>\r
+    <ClCompile />\r
     <Lib>\r
       <OutputFile>$(OutDir)\$(ProjectName)$(DebugSuffix).lib</OutputFile>\r
     </Lib>\r
+    <ClCompile>\r
+      <PreprocessorDefinitions>DEBUG_INTERNAL;DEBUG_ALL;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+    </ClCompile>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
     <BuildMacro Include="DebugSuffix">\r
       <Value>$(DebugSuffix)</Value>\r
+      <EnvironmentVariable>true</EnvironmentVariable>\r
     </BuildMacro>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file