Title: [149385] trunk/Source/WebKit
- Revision
- 149385
- Author
- [email protected]
- Date
- 2013-04-30 11:38:06 -0700 (Tue, 30 Apr 2013)
Log Message
[Windows, WinCairo] Remove pthread paths for WebKit build.
https://bugs.webkit.org/show_bug.cgi?id=115390
Reviewed by Tim Horton.
Update Visual Studio property sheets to remove include paths and
link references for the pthreadsVC2.dll, which is no longer used.
../WebKit:
* WebKit.vcxproj/WebKit/WebKitCommon.props:
* WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorCommon.props:
../WebKit/win:
* WebKit.vcproj/WebKitExportGeneratorCommon.vsprops:
* WebKit.vcproj/WebKitLibCommon.vsprops:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (149384 => 149385)
--- trunk/Source/WebKit/ChangeLog 2013-04-30 18:25:11 UTC (rev 149384)
+++ trunk/Source/WebKit/ChangeLog 2013-04-30 18:38:06 UTC (rev 149385)
@@ -1,3 +1,16 @@
+2013-04-29 Brent Fulgham <[email protected]>
+
+ [Windows, WinCairo] Remove pthread paths for WebKit build.
+ https://bugs.webkit.org/show_bug.cgi?id=115390
+
+ Reviewed by Tim Horton.
+
+ Update Visual Studio property sheets to remove include paths and
+ link references for the pthreadsVC2.dll, which is no longer used.
+
+ * WebKit.vcxproj/WebKit/WebKitCommon.props:
+ * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorCommon.props:
+
2013-04-28 Ryosuke Niwa <[email protected]>
Windows build fix.
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitCommon.props (149384 => 149385)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitCommon.props 2013-04-30 18:25:11 UTC (rev 149384)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitCommon.props 2013-04-30 18:38:06 UTC (rev 149385)
@@ -5,7 +5,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)\..\..\win;$(ProjectDir)\..\..\win\WebCoreSupport;$(ConfigurationBuildDir)\include\WebKit;$(ConfigurationBuildDir)\Include;$(ConfigurationBuildDir)\Include\private;$(ConfigurationBuildDir)\Include\WebCore;$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\Include\_javascript_Core;$(ConfigurationBuildDir)\Include\private\_javascript_Core;$(ConfigurationBuildDir)\obj32\WebKit\DerivedSources;$(WebKit_Libraries)\Include;$(WebKit_Libraries)\Include\private;$(WebKit_Libraries)\Include\WebCore;$(WebKit_Libraries)\Include\WebCore\ForwardingHeaders;$(WebKit_Libraries)\Include\_javascript_Core;$(WebKit_Libraries)\Include\private\_javascript_Core;$(WebKit_Libraries)\include\pthreads;$(IntDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)\..\..\win;$(ProjectDir)\..\..\win\WebCoreSupport;$(ConfigurationBuildDir)\include\WebKit;$(ConfigurationBuildDir)\Include;$(ConfigurationBuildDir)\Include\private;$(ConfigurationBuildDir)\Include\WebCore;$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\Include\_javascript_Core;$(ConfigurationBuildDir)\Include\private\_javascript_Core;$(ConfigurationBuildDir)\obj32\WebKit\DerivedSources;$(WebKit_Libraries)\Include;$(WebKit_Libraries)\Include\private;$(WebKit_Libraries)\Include\WebCore;$(WebKit_Libraries)\Include\WebCore\ForwardingHeaders;$(WebKit_Libraries)\Include\_javascript_Core;$(WebKit_Libraries)\Include\private\_javascript_Core;$(IntDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WEBKIT_EXPORTS;FRAMEWORK_NAME=WebKit;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>WebKitPrefix.h</PrecompiledHeaderFile>
@@ -18,4 +18,4 @@
<DelayLoadDLLs>usp10.dll;comctl32.dll;version.dll;iphlpapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
</Link>
</ItemDefinitionGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorCommon.props (149384 => 149385)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorCommon.props 2013-04-30 18:25:11 UTC (rev 149384)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorCommon.props 2013-04-30 18:38:06 UTC (rev 149385)
@@ -5,7 +5,7 @@
<PropertyGroup />
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalIncludeDirectories>$(ConfigurationBuildDir)\Include\;$(ConfigurationBuildDir)\Include\private;$(ConfigurationBuildDir)\Include\WebCore;$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders;$(WebKit_Libraries)\Include;$(WebKit_Libraries)\Include\private;$(WebKit_Libraries)\Include\pthreads;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ConfigurationBuildDir)\Include\;$(ConfigurationBuildDir)\Include\private;$(ConfigurationBuildDir)\Include\WebCore;$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders;$(WebKit_Libraries)\Include;$(WebKit_Libraries)\Include\private;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
@@ -14,4 +14,4 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup />
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/Source/WebKit/win/ChangeLog (149384 => 149385)
--- trunk/Source/WebKit/win/ChangeLog 2013-04-30 18:25:11 UTC (rev 149384)
+++ trunk/Source/WebKit/win/ChangeLog 2013-04-30 18:38:06 UTC (rev 149385)
@@ -1,3 +1,17 @@
+2013-04-29 Brent Fulgham <[email protected]>
+
+ [Windows, WinCairo] Remove pthread paths for WebKit build.
+ https://bugs.webkit.org/show_bug.cgi?id=115390
+
+ Reviewed by Tim Horton.
+
+ Update Visual Studio property sheets to remove include paths and
+ link references for the pthreadsVC2.dll, which is no longer used.
+
+
+ * WebKit.vcproj/WebKitExportGeneratorCommon.vsprops:
+ * WebKit.vcproj/WebKitLibCommon.vsprops:
+
2013-04-30 Christophe Dumez <[email protected]>
Stop using "in" keyword in IDL files
Modified: trunk/Source/WebKit/win/WebKit.vcproj/WebKitExportGeneratorCommon.vsprops (149384 => 149385)
--- trunk/Source/WebKit/win/WebKit.vcproj/WebKitExportGeneratorCommon.vsprops 2013-04-30 18:25:11 UTC (rev 149384)
+++ trunk/Source/WebKit/win/WebKit.vcproj/WebKitExportGeneratorCommon.vsprops 2013-04-30 18:38:06 UTC (rev 149385)
@@ -6,12 +6,12 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)\..";"$(ConfigurationBuildDir)\Include\WebCore";"$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources";"$(ConfigurationBuildDir)\Include";"$(ConfigurationBuildDir)\Include\private";"$(WebKitLibrariesDir)\Include";"$(WebKitLibrariesDir)\Include\private";"$(WebKitLibrariesDir)\Include\pthreads";"$(ConfigurationBuildDir)\Include\_javascript_Core";"$(ConfigurationBuildDir)\Include\private\_javascript_Core";"$(WebKitLibrariesDir)\Include\_javascript_Core";"$(WebKitLibrariesDir)\Include\private\_javascript_Core";"$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders""
+ AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)\..";"$(ConfigurationBuildDir)\Include\WebCore";"$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources";"$(ConfigurationBuildDir)\Include";"$(ConfigurationBuildDir)\Include\private";"$(WebKitLibrariesDir)\Include";"$(WebKitLibrariesDir)\Include\private";"$(ConfigurationBuildDir)\Include\_javascript_Core";"$(ConfigurationBuildDir)\Include\private\_javascript_Core";"$(WebKitLibrariesDir)\Include\_javascript_Core";"$(WebKitLibrariesDir)\Include\private\_javascript_Core";"$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders""
DisableSpecificWarnings="4481;4819"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="WTF$(WebKitConfigSuffix).lib libicuuc.lib pthreadVC2$(LibraryConfigSuffix).lib winmm.lib"
+ AdditionalDependencies="WTF$(WebKitConfigSuffix).lib libicuuc.lib winmm.lib"
SubSystem="1"
/>
</VisualStudioPropertySheet>
Modified: trunk/Source/WebKit/win/WebKit.vcproj/WebKitLibCommon.vsprops (149384 => 149385)
--- trunk/Source/WebKit/win/WebKit.vcproj/WebKitLibCommon.vsprops 2013-04-30 18:25:11 UTC (rev 149384)
+++ trunk/Source/WebKit/win/WebKit.vcproj/WebKitLibCommon.vsprops 2013-04-30 18:38:06 UTC (rev 149385)
@@ -6,7 +6,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebKit";"$(ConfigurationBuildDir)\Include";"$(ConfigurationBuildDir)\Include\private";"$(WebKitLibrariesDir)\Include";"$(WebKitLibrariesDir)\Include\private";"$(ConfigurationBuildDir)\Include\WebCore";"$(WebKitLibrariesDir)\Include\WebCore";"$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\Include\_javascript_Core";"$(ConfigurationBuildDir)\Include\private\_javascript_Core";"$(WebKitLibrariesDir)\Include\_javascript_Core";"$(WebKitLibrariesDir)\Include\private\_javascript_Core";"$(WebKitLibrariesDir)\include\pthreads";"$(ProjectDir)\..";"$(ProjectDir)";"$(ProjectDir)\..\WebCoreSupport";"$(IntDir)\include";"$(ConfigurationBuildDir)\obj\WebKit\DerivedSources""
+ AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebKit";"$(ConfigurationBuildDir)\Include";"$(ConfigurationBuildDir)\Include\private";"$(WebKitLibrariesDir)\Include";"$(WebKitLibrariesDir)\Include\private";"$(ConfigurationBuildDir)\Include\WebCore";"$(WebKitLibrariesDir)\Include\WebCore";"$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\Include\_javascript_Core";"$(ConfigurationBuildDir)\Include\private\_javascript_Core";"$(WebKitLibrariesDir)\Include\_javascript_Core";"$(WebKitLibrariesDir)\Include\private\_javascript_Core";"$(ProjectDir)\..";"$(ProjectDir)";"$(ProjectDir)\..\WebCoreSupport";"$(IntDir)\include";"$(ConfigurationBuildDir)\obj\WebKit\DerivedSources""
PreprocessorDefinitions="_USRDLL;WEBKIT_EXPORTS;FRAMEWORK_NAME=WebKit"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="WebKitPrefix.h"
@@ -16,7 +16,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="delayimp.lib kernel32.lib user32.lib gdi32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib usp10.lib comctl32.lib version.lib shlwapi.lib libxml2$(LibraryConfigSuffix).lib libxslt$(LibraryConfigSuffix).lib libicuin$(LibraryConfigSuffix).lib libicuuc$(LibraryConfigSuffix).lib SQLite3$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib _javascript_Core$(WebKitDLLConfigSuffix).lib WebCore$(WebKitConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib msimg32.lib crypt32.lib iphlpapi.lib winmm.lib comsuppw.lib rpcrt4.lib zdll$(LibraryConfigSuffix).lib"
+ AdditionalDependencies="delayimp.lib kernel32.lib user32.lib gdi32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib usp10.lib comctl32.lib version.lib shlwapi.lib libxml2$(LibraryConfigSuffix).lib libxslt$(LibraryConfigSuffix).lib libicuin$(LibraryConfigSuffix).lib libicuuc$(LibraryConfigSuffix).lib SQLite3$(LibraryConfigSuffix).lib _javascript_Core$(WebKitDLLConfigSuffix).lib WebCore$(WebKitConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib msimg32.lib crypt32.lib iphlpapi.lib winmm.lib comsuppw.lib rpcrt4.lib zdll$(LibraryConfigSuffix).lib"
OutputFile="$(OutDir)\WebKit$(WebKitDLLConfigSuffix).dll"
AdditionalLibraryDirectories=""$(IntDir)\lib""
ModuleDefinitionFile="$(ConfigurationBuildDir)\obj\WebKitExportGenerator\WebKitExports.def"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
