[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

bfulgham at webkit.org bfulgham at webkit.org
Sun Feb 20 23:45:25 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 86c7b54ca055b4bd674582cd607406a54be4f367
Author: bfulgham at webkit.org <bfulgham at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 24 23:40:38 2011 +0000

    Unreviewed build fix.
    
    * win/WebKit2.vcproj: Don't build the CG Utilities when building
    without CG support.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76551 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 0d96205..7842bdc 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-24  Brent Fulgham  <bfulgham at webkit.org>
+
+        Unreviewed build fix.
+
+        * win/WebKit2.vcproj: Don't build the CG Utilities when building
+        without CG support.
+
 2011-01-24  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by John Sullivan.
diff --git a/Source/WebKit2/win/WebKit2.vcproj b/Source/WebKit2/win/WebKit2.vcproj
index 0742c6e..9c612c2 100755
--- a/Source/WebKit2/win/WebKit2.vcproj
+++ b/Source/WebKit2/win/WebKit2.vcproj
@@ -2848,6 +2848,22 @@
 				<File
 					RelativePath="..\Platform\cg\CGUtilities.cpp"
 					>
+					<FileConfiguration
+						Name="Debug_Cairo_CFLite|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release_Cairo_CFLite|Win32"
+						ExcludedFromBuild="true"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+						/>
+					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\Platform\cg\CGUtilities.h"

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list