[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
adachan at apple.com
adachan at apple.com
Wed Dec 22 11:17:55 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 62f3ac4fa3fdf9b6d522458e83a7dfcba586a6c8
Author: adachan at apple.com <adachan at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jul 16 23:18:36 2010 +0000
Reviewed by Alice Liu.
Fix Windows build.
* WebKitTestRunner/InjectedBundle/win/InjectedBundle.vcproj:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63597 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index c578193..c2f4c54 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2010-07-16 Ada Chan <adachan at apple.com>
+
+ Reviewed by Alice Liu.
+
+ Fix Windows build.
+
+ * WebKitTestRunner/InjectedBundle/win/InjectedBundle.vcproj:
+
2010-07-16 Sam Weinig <sam at webkit.org>
Reviewed by Anders Carlsson.
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/win/InjectedBundle.vcproj b/WebKitTools/WebKitTestRunner/InjectedBundle/win/InjectedBundle.vcproj
index 458b48f..10978e0 100644
--- a/WebKitTools/WebKitTestRunner/InjectedBundle/win/InjectedBundle.vcproj
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/win/InjectedBundle.vcproj
@@ -39,7 +39,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(ProjectDir)\..";"$(ProjectDir)";"$(WebKitOutputDir)\Include";"$(WebKitOutputDir)\Include\private";"$(WebKitOutputDir)\Include\ForwardingHeaders";"$(WebKitLibrariesDir)\include""
+ AdditionalIncludeDirectories=""$(ProjectDir)\..";"$(ProjectDir)\..\..";"$(WebKitOutputDir)\Include";"$(WebKitOutputDir)\Include\private";"$(WebKitOutputDir)\Include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\include""
ForcedIncludeFiles="WebKitTestRunnerPrefix.h"
/>
<Tool
@@ -107,7 +107,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(ProjectDir)\..";"$(ProjectDir)";"$(WebKitOutputDir)\Include";"$(WebKitOutputDir)\Include\private";"$(WebKitOutputDir)\Include\ForwardingHeaders";"$(WebKitLibrariesDir)\include""
+ AdditionalIncludeDirectories=""$(ProjectDir)\..";"$(ProjectDir)\..\..";"$(WebKitOutputDir)\Include";"$(WebKitOutputDir)\Include\private";"$(WebKitOutputDir)\Include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\include""
ForcedIncludeFiles="WebKitTestRunnerPrefix.h"
/>
<Tool
@@ -174,7 +174,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(ProjectDir)\..";"$(ProjectDir)";"$(WebKitOutputDir)\Include";"$(WebKitOutputDir)\Include\private";"$(WebKitOutputDir)\Include\ForwardingHeaders";"$(WebKitLibrariesDir)\include""
+ AdditionalIncludeDirectories=""$(ProjectDir)\..";"$(ProjectDir)\..\..";"$(WebKitOutputDir)\Include";"$(WebKitOutputDir)\Include\private";"$(WebKitOutputDir)\Include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\include""
RuntimeLibrary="3"
ForcedIncludeFiles="WebKitTestRunnerPrefix.h"
/>
@@ -223,35 +223,35 @@
</References>
<Files>
<File
- RelativePath=".\win\ActivateFonts.cpp"
+ RelativePath="ActivateFonts.cpp"
>
</File>
<File
- RelativePath=".\InjectedBundle.cpp"
+ RelativePath="..\InjectedBundle.cpp"
>
</File>
<File
- RelativePath=".\InjectedBundle.h"
+ RelativePath="..\InjectedBundle.h"
>
</File>
<File
- RelativePath=".\InjectedBundleMain.cpp"
+ RelativePath="..\InjectedBundleMain.cpp"
>
</File>
<File
- RelativePath=".\InjectedBundlePage.cpp"
+ RelativePath="..\InjectedBundlePage.cpp"
>
</File>
<File
- RelativePath=".\InjectedBundlePage.h"
+ RelativePath="..\InjectedBundlePage.h"
>
</File>
<File
- RelativePath=".\LayoutTestController.cpp"
+ RelativePath="..\LayoutTestController.cpp"
>
</File>
<File
- RelativePath=".\LayoutTestController.h"
+ RelativePath="..\LayoutTestController.h"
>
</File>
</Files>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list