From 45f1e6ca58f3c565752a1b838f8a7a4c3b84bc3e Mon Sep 17 00:00:00 2001 From: aroben Date: Sun, 17 Sep 2006 21:39:49 +0000 Subject: [PATCH] Reviewed by hyatt, sfalken. Get DumpRenderTree compiling and limping along on Windows. * DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.cpp: (loadResourceIntoArray): Added this function that WebCore::ImageWin needs from WebKit (main): Add NULL argument to Page constructor. * DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.vcproj: Remove incorrect "wininet.dll" argument to CC, fix JavaScriptCore.lib path, add *_SECURE_NO_DEPRECATE #defines * Scripts/webkitdirs.pm: Fix JavaScriptCore.lib path git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16409 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- WebKitTools/ChangeLog | 12 + .../DumpRenderTree/DumpRenderTree.cpp | 4 +- .../DumpRenderTree/DumpRenderTree.vcproj | 384 +++++++++--------- WebKitTools/Scripts/webkitdirs.pm | 6 +- 4 files changed, 211 insertions(+), 195 deletions(-) diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog index 3a5c39a62f9b..4eab177d5180 100644 --- a/WebKitTools/ChangeLog +++ b/WebKitTools/ChangeLog @@ -1,3 +1,15 @@ +2006-09-17 Adam Roben + + Reviewed by hyatt, sfalken. + + Get DumpRenderTree compiling and limping along on Windows. + + * DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.cpp: + (loadResourceIntoArray): Added this function that WebCore::ImageWin needs from WebKit + (main): Add NULL argument to Page constructor. + * DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.vcproj: Remove incorrect "wininet.dll" argument to CC, fix JavaScriptCore.lib path, add *_SECURE_NO_DEPRECATE #defines + * Scripts/webkitdirs.pm: Fix JavaScriptCore.lib path + 2006-09-15 Mark Rowe Reviewed by Brady. diff --git a/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.cpp index 32a35df07016..b749b67ef26b 100644 --- a/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.cpp +++ b/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.cpp @@ -40,6 +40,8 @@ using namespace WebCore; +Vector loadResourceIntoArray(char const *) { Vector v; return v; } + static void localFileTest(FrameWin* frame, char* path) { frame->begin(); @@ -92,7 +94,7 @@ static void serializeToStdOut(FrameWin* frame) int main(int argc, char* argv[]) { - Page* page = new Page(); + Page* page = new Page(0); FrameWin* frame = new FrameWin(page, 0, 0); FrameView* frameView = new FrameView(frame); frame->setView(frameView); diff --git a/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.vcproj b/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.vcproj index 39b11fc5d876..56a6869fb815 100644 --- a/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.vcproj +++ b/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.vcproj @@ -1,193 +1,191 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm index 48c453387516..e7b4cad1b606 100644 --- a/WebKitTools/Scripts/webkitdirs.pm +++ b/WebKitTools/Scripts/webkitdirs.pm @@ -260,7 +260,11 @@ sub builtDylibPathForName return "$configurationProductDir/$framework.framework/Versions/A/$framework"; } if (isCygwin()) { - return "$baseProductDir/$framework.intermediate/$configuration/$framework.intermediate/$framework.lib"; + if ($framework eq "JavaScriptCore") { + return "$baseProductDir/lib/$framework.lib"; + } else { + return "$baseProductDir/$framework.intermediate/$configuration/$framework.intermediate/$framework.lib"; + } } if (isQt()) { return "$baseProductDir/../../../$framework"; -- 2.36.0