2008-09-07 Stephanie Lewis <slewis@apple.com>
authorslewis@apple.com <slewis@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 7 Sep 2008 07:12:45 +0000 (07:12 +0000)
committerslewis@apple.com <slewis@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 7 Sep 2008 07:12:45 +0000 (07:12 +0000)
        Reviewed by Mark Rowe.

        Fix DRT build

        * DumpRenderTree/DumpRenderTreePrefix.h:
        * DumpRenderTree/win/DumpRenderTree.vcproj:

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

WebKitTools/ChangeLog
WebKitTools/DumpRenderTree/DumpRenderTreePrefix.h
WebKitTools/DumpRenderTree/win/DumpRenderTree.vcproj

index 793c0fe..c5b1aa1 100644 (file)
@@ -1,3 +1,12 @@
+2008-09-07  Stephanie Lewis  <slewis@apple.com>
+
+        Reviewed by Mark Rowe.
+
+        Fix DRT build 
+
+        * DumpRenderTree/DumpRenderTreePrefix.h:
+        * DumpRenderTree/win/DumpRenderTree.vcproj:
+
 2008-09-06  Steve Falkenburg  <sfalken@apple.com>
 
         Fix Windows nightlies.
index cb40968..1344754 100644 (file)
@@ -31,3 +31,8 @@
 #import <Foundation/Foundation.h>
 
 #endif
+
+// If we don't define these, they get defined in windef.h. 
+// We want to use std::min and std::max
+#define max max
+#define min min
index 5864d08..e094bde 100644 (file)
@@ -42,6 +42,7 @@
                                AdditionalIncludeDirectories="&quot;$(ProjectDir)\.&quot;;&quot;$(ProjectDir)\..&quot;;&quot;$(ProjectDir)\..\cg&quot;;&quot;$(WebKitOutputDir)\Include&quot;;&quot;$(WebKitOutputDir)\Include\DumpRenderTree\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\Include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\Include&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;;&quot;$(WebKitOutputDir)\Include\WebCore&quot;;&quot;$(WebKitLibrariesDir)\Include\WebCore&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility&quot;"\r
                                PreprocessorDefinitions="_CONSOLE"\r
                                DisableSpecificWarnings="4146"\r
+                               ForcedIncludeFiles="DumpRenderTreePrefix.h"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                                AdditionalIncludeDirectories="&quot;$(ProjectDir)\.&quot;;&quot;$(ProjectDir)\..&quot;;&quot;$(ProjectDir)\..\cg&quot;;&quot;$(WebKitOutputDir)\Include&quot;;&quot;$(WebKitOutputDir)\Include\DumpRenderTree\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\Include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\Include&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;;&quot;$(WebKitOutputDir)\Include\WebCore&quot;;&quot;$(WebKitLibrariesDir)\Include\WebCore&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility&quot;"\r
                                PreprocessorDefinitions="_CONSOLE"\r
                                DisableSpecificWarnings="4146"\r
+                               ForcedIncludeFiles="DumpRenderTreePrefix.h"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                                AdditionalIncludeDirectories="&quot;$(ProjectDir)\.&quot;;&quot;$(ProjectDir)\..&quot;;&quot;$(ProjectDir)\..\cg&quot;;&quot;$(WebKitOutputDir)\Include&quot;;&quot;$(WebKitOutputDir)\Include\DumpRenderTree\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\Include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\Include&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;;&quot;$(WebKitOutputDir)\Include\WebCore&quot;;&quot;$(WebKitLibrariesDir)\Include\WebCore&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility&quot;"\r
                                PreprocessorDefinitions="_CONSOLE;DEBUG_WEBKIT_HAS_SUFFIX"\r
                                DisableSpecificWarnings="4146"\r
+                               ForcedIncludeFiles="DumpRenderTreePrefix.h"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        >\r
                </File>\r
                <File\r
+                       RelativePath="..\DumpRenderTreePrefix.h"\r
+                       >\r
+               </File>\r
+               <File\r
                        RelativePath=".\DumpRenderTreeWin.h"\r
                        >\r
                </File>\r