[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf
aroben at apple.com
aroben at apple.com
Tue Jan 5 23:47:41 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 34251ec6d0c0c4e203502ecf57a52cb16857cc17
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 11 21:31:14 2009 +0000
Windows build fix
JavaScriptCore:
* JavaScriptCore.vcproj/jsc/jscCommon.vsprops: Added
$(WebKitOutputDir)/include/private to the include path.
WebCore:
* platform/graphics/win/WKCACFLayerRenderer.cpp: Removed #include of
non-existent header.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52020 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index f11c3b4..88386d3 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,12 @@
2009-12-11 Adam Roben <aroben at apple.com>
+ Windows build fix
+
+ * JavaScriptCore.vcproj/jsc/jscCommon.vsprops: Added
+ $(WebKitOutputDir)/include/private to the include path.
+
+2009-12-11 Adam Roben <aroben at apple.com>
+
Move QuartzCorePresent.h to include/private
This fixes other projects that use wtf/Platform.h
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscCommon.vsprops b/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscCommon.vsprops
index 1a8f8b6..a0db10c 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscCommon.vsprops
+++ b/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscCommon.vsprops
@@ -6,7 +6,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(WebKitOutputDir)\include";"$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../assembler/;../../wrec/;../../parser/;../../runtime/;../../VM/;../../bytecode/;../../interpreter/;../../wtf/;../../debugger/;../../bytecompiler/;../../profiler;"$(WebKitLibrariesDir)\include\icu";"$(WebKitLibrariesDir)\include\pthreads";../../../icu/include;"$(WebKitLibrariesDir)\include";../../jit/"
+ AdditionalIncludeDirectories=""$(WebKitOutputDir)\include";"$(WebKitOutputDir)\include\private";"$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\";../../;"../../os-win32/";../../pcre/;../../assembler/;../../wrec/;../../parser/;../../runtime/;../../VM/;../../bytecode/;../../interpreter/;../../wtf/;../../debugger/;../../bytecompiler/;../../profiler;"$(WebKitLibrariesDir)\include\icu";"$(WebKitLibrariesDir)\include\pthreads";../../../icu/include;"$(WebKitLibrariesDir)\include";../../jit/"
PreprocessorDefinitions="__STD_C"
/>
<Tool
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 985b1f6..ed8df58 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-11 Adam Roben <aroben at apple.com>
+
+ Windows build fix
+
+ * platform/graphics/win/WKCACFLayerRenderer.cpp: Removed #include of
+ non-existent header.
+
2009-12-11 Simon Fraser <simon.fraser at apple.com>
Build fix, no review.
diff --git a/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp b/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp
index 23670b2..5ad08ee 100644
--- a/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp
+++ b/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp
@@ -39,7 +39,6 @@
#include <wtf/OwnArrayPtr.h>
#include <d3d9.h>
#include <d3dx9.h>
-#include <dxerr9.h>
#pragma comment(lib, "d3d9")
#pragma comment(lib, "d3dx9")
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list