[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
aroben at apple.com
aroben at apple.com
Wed Dec 22 11:22:37 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 73fd6cc30aef69264d5b2ea51beadfefdbf48a69
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jul 21 00:00:41 2010 +0000
Windows build fix
* MiniBrowser/MiniBrowser.vcproj: Link against the new, shiny
WebKit.lib instead of the old, dusty WebKit2.lib.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63790 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index e473802..00d3456 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,12 @@
2010-07-20 Adam Roben <aroben at apple.com>
+ Windows build fix
+
+ * MiniBrowser/MiniBrowser.vcproj: Link against the new, shiny
+ WebKit.lib instead of the old, dusty WebKit2.lib.
+
+2010-07-20 Adam Roben <aroben at apple.com>
+
Stop linking WebKitTestRunner against getopt
Use of getopt was removed in r63700.
diff --git a/WebKitTools/MiniBrowser/MiniBrowser.vcproj b/WebKitTools/MiniBrowser/MiniBrowser.vcproj
index 8b956e7..cba2dfb 100644
--- a/WebKitTools/MiniBrowser/MiniBrowser.vcproj
+++ b/WebKitTools/MiniBrowser/MiniBrowser.vcproj
@@ -66,7 +66,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="shlwapi.lib WebKit2$(WebKitDLLConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib CFNetwork$(LibraryConfigSuffix).lib"
+ AdditionalDependencies="shlwapi.lib WebKit$(WebKitDLLConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib CFNetwork$(LibraryConfigSuffix).lib"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
@@ -149,7 +149,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="shlwapi.lib WebKit2$(WebKitDLLConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib CFNetwork$(LibraryConfigSuffix).lib"
+ AdditionalDependencies="shlwapi.lib WebKit$(WebKitDLLConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib CFNetwork$(LibraryConfigSuffix).lib"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list