[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

sfalken at apple.com sfalken at apple.com
Fri Jan 21 15:00:51 UTC 2011


The following commit has been merged in the debian/experimental branch:
commit 1c577514e3c88feabb6db5416af7bd19384f0fa8
Author: sfalken at apple.com <sfalken at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 6 06:20:35 2011 +0000

    Windows build fix.
    
    * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops: Revert change to additional library search path needed to find ICU.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75141 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 053cfd2..7b250c3 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,5 +1,11 @@
 2011-01-05  Steve Falkenburg  <sfalken at apple.com>
 
+        Windows build fix.
+
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops: Revert change to additional library search path needed to find ICU.
+
+2011-01-05  Steve Falkenburg  <sfalken at apple.com>
+
         Reviewed by Darin Adler.
 
         Debug and Release builds on Windows clobber each other
diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops
index 70dbe6f..2a85beb 100644
--- a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops
+++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops
@@ -14,7 +14,7 @@
 		Name="VCLinkerTool"
 		AdditionalDependencies="gdi32.lib oleaut32.lib winmm.lib libicuin$(LibraryConfigSuffix).lib libicuuc$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib WTF$(WebKitConfigSuffix).lib"
 		OutputFile="$(OutDir)\$(ProjectName)$(WebKitDLLConfigSuffix).dll"
-		AdditionalLibraryDirectories="&quot;$(ConfigurationBuildDir)\lib&quot;"
+		AdditionalLibraryDirectories="&quot;$(IntDir)\lib&quot;"
 		ModuleDefinitionFile="JavaScriptCore.def"
 	/>
 </VisualStudioPropertySheet>

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list