[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
aroben at apple.com
aroben at apple.com
Thu Apr 8 00:35:17 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 0104b29dd6037e244b3a0cd42189eb885cb3cfab
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Dec 14 15:38:01 2009 +0000
Move QuartzCore-related build settings into a vsprops file
Fixes <http://webkit.org/b/32518>
Reviewed by Dan Bernstein.
* WebCore.vcproj/WebCore.vcproj: Let VS reformat the files list, added
WebCoreQuartzCore.vsprops to the non-Cairo configurations, moved all
other QuartzCore-related build settings from here...
* WebCore.vcproj/WebCoreQuartzCore.vsprops: ...to here.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52092 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d49a489..f303804 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-14 Adam Roben <aroben at apple.com>
+
+ Move QuartzCore-related build settings into a vsprops file
+
+ Fixes <http://webkit.org/b/32518>
+
+ Reviewed by Dan Bernstein.
+
+ * WebCore.vcproj/WebCore.vcproj: Let VS reformat the files list, added
+ WebCoreQuartzCore.vsprops to the non-Cairo configurations, moved all
+ other QuartzCore-related build settings from here...
+ * WebCore.vcproj/WebCoreQuartzCore.vsprops: ...to here.
+
2009-12-14 Yael Aharon <yael.aharon at nokia.com>
Reviewed by Antti Koivisto.
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index 452656a..ef2700a 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -18,7 +18,7 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="4"
- InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;.\WebCoreCommon.vsprops;.\WebCoreCG.vsprops;.\WebCoreCFNetwork.vsprops;.\WebCorePthreads.vsprops;.\WebCoreMediaQT.vsprops"
+ InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;.\WebCoreCommon.vsprops;.\WebCoreCG.vsprops;.\WebCoreCFNetwork.vsprops;.\WebCorePthreads.vsprops;.\WebCoreMediaQT.vsprops;.\WebCoreQuartzCore.vsprops"
CharacterSet="1"
>
<Tool
@@ -38,8 +38,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(DXSDK_DIR)\Include"
- PreprocessorDefinitions="QUARTZCORE_DLL"
+ AdditionalIncludeDirectories=""
ForcedIncludeFiles=""
/>
<Tool
@@ -74,7 +73,7 @@
<Configuration
Name="Release|Win32"
ConfigurationType="4"
- InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops;.\WebCoreCommon.vsprops;.\WebCoreCG.vsprops;.\WebCoreCFNetwork.vsprops;.\WebCorePthreads.vsprops;.\WebCoreMediaQT.vsprops"
+ InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops;.\WebCoreCommon.vsprops;.\WebCoreCG.vsprops;.\WebCoreCFNetwork.vsprops;.\WebCorePthreads.vsprops;.\WebCoreMediaQT.vsprops;.\WebCoreQuartzCore.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
@@ -95,8 +94,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(DXSDK_DIR)\Include"
- PreprocessorDefinitions="QUARTZCORE_DLL"
+ AdditionalIncludeDirectories=""
ForcedIncludeFiles=""
/>
<Tool
@@ -131,7 +129,7 @@
<Configuration
Name="Debug_Internal|Win32"
ConfigurationType="4"
- InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops;.\WebCoreCommon.vsprops;.\WebCoreCG.vsprops;.\WebCoreCFNetwork.vsprops;.\WebCorePthreads.vsprops;.\WebCoreMediaQT.vsprops"
+ InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops;.\WebCoreCommon.vsprops;.\WebCoreCG.vsprops;.\WebCoreCFNetwork.vsprops;.\WebCorePthreads.vsprops;.\WebCoreMediaQT.vsprops;.\WebCoreQuartzCore.vsprops"
CharacterSet="1"
>
<Tool
@@ -151,8 +149,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(DXSDK_DIR)\Include"
- PreprocessorDefinitions="QUARTZCORE_DLL"
+ AdditionalIncludeDirectories=""
ForcedIncludeFiles=""
/>
<Tool
@@ -207,8 +204,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(DXSDK_DIR)\Include"
- PreprocessorDefinitions="QUARTZCORE_DLL"
+ AdditionalIncludeDirectories=""
ForcedIncludeFiles=""
/>
<Tool
@@ -264,8 +260,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(DXSDK_DIR)\Include"
- PreprocessorDefinitions="QUARTZCORE_DLL"
+ AdditionalIncludeDirectories=""
ForcedIncludeFiles=""
/>
<Tool
@@ -300,7 +295,7 @@
<Configuration
Name="Debug_All|Win32"
ConfigurationType="4"
- InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops;.\WebCoreCommon.vsprops;.\WebCoreCG.vsprops;.\WebCoreCFNetwork.vsprops;.\WebCorePthreads.vsprops;.\WebCoreMediaQT.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_all.vsprops"
+ InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops;.\WebCoreCommon.vsprops;.\WebCoreCG.vsprops;.\WebCoreCFNetwork.vsprops;.\WebCorePthreads.vsprops;.\WebCoreMediaQT.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_all.vsprops;.\WebCoreQuartzCore.vsprops"
CharacterSet="1"
>
<Tool
@@ -320,8 +315,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(DXSDK_DIR)\Include"
- PreprocessorDefinitions="QUARTZCORE_DLL"
+ AdditionalIncludeDirectories=""
ForcedIncludeFiles=""
/>
<Tool
@@ -37222,7 +37216,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\bindings\js\JSInspectedObjectWrapper.cpp"
+ RelativePath="..\bindings\js\JSInjectedScriptHostCustom.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -37274,11 +37268,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\bindings\js\JSInspectedObjectWrapper.h"
- >
- </File>
- <File
- RelativePath="..\bindings\js\JSInjectedScriptHostCustom.cpp"
+ RelativePath="..\bindings\js\JSInspectedObjectWrapper.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -37330,6 +37320,18 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\bindings\js\JSInspectedObjectWrapper.h"
+ >
+ </File>
+ <File
+ RelativePath="..\bindings\js\JSInspectorCallbackWrapper.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\bindings\js\JSInspectorCallbackWrapper.h"
+ >
+ </File>
+ <File
RelativePath="..\bindings\js\JSInspectorFrontendHostCustom.cpp"
>
<FileConfiguration
@@ -37382,14 +37384,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\bindings\js\JSInspectorCallbackWrapper.cpp"
- >
- </File>
- <File
- RelativePath="..\bindings\js\JSInspectorCallbackWrapper.h"
- >
- </File>
- <File
RelativePath="..\bindings\js\JSJavaScriptCallFrameCustom.cpp"
>
<FileConfiguration
diff --git a/WebCore/WebCore.vcproj/WebCoreQuartzCore.vsprops b/WebCore/WebCore.vcproj/WebCoreQuartzCore.vsprops
new file mode 100644
index 0000000..17dfcb2
--- /dev/null
+++ b/WebCore/WebCore.vcproj/WebCoreQuartzCore.vsprops
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="WebCoreQuartzCore"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""$(DXSDK_DIR)\Include""
+ PreprocessorDefinitions="QUARTZCORE_DLL"
+ />
+</VisualStudioPropertySheet>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list