Title: [150095] trunk/Tools
- Revision
- 150095
- Author
- bfulg...@apple.com
- Date
- 2013-05-14 18:00:26 -0700 (Tue, 14 May 2013)
Log Message
[Windows] Expunge pthreads2VC.dll from DumpRenderTree Project
https://bugs.webkit.org/show_bug.cgi?id=115889
Patch by Brent Fulgham <bfulg...@webkit.org> on 2013-05-14
Reviewed by Benjamin Poulain.
* DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeCommon.props:
* DumpRenderTree/win/DumpRenderTreeCommon.vsprops:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (150094 => 150095)
--- trunk/Tools/ChangeLog 2013-05-15 00:27:36 UTC (rev 150094)
+++ trunk/Tools/ChangeLog 2013-05-15 01:00:26 UTC (rev 150095)
@@ -1,3 +1,13 @@
+2013-05-14 Brent Fulgham <bfulg...@webkit.org>
+
+ [Windows] Expunge pthreads2VC.dll from DumpRenderTree Project
+ https://bugs.webkit.org/show_bug.cgi?id=115889
+
+ Reviewed by Benjamin Poulain.
+
+ * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeCommon.props:
+ * DumpRenderTree/win/DumpRenderTreeCommon.vsprops:
+
2013-05-14 Brent Fulgham <bfulg...@apple.com>
[Windows] Identify proper run environment for scripts.
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeCommon.props (150094 => 150095)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeCommon.props 2013-05-15 00:27:36 UTC (rev 150094)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeCommon.props 2013-05-15 01:00:26 UTC (rev 150095)
@@ -2,14 +2,14 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalIncludeDirectories>$(ProjectDir)\..\..;$(ProjectDir)\..\..\win;$(ConfigurationBuildDir)\Include;$(ConfigurationBuildDir)\Include\private;$(ConfigurationBuildDir)\Include\DumpRenderTree\ForwardingHeaders;$(ConfigurationBuildDir)\Include\_javascript_Core;$(ConfigurationBuildDir)\Include\private\_javascript_Core;$(ConfigurationBuildDir)\Include\WebCoreTestSupport;$(ConfigurationBuildDir)\Include\WebCore;$(WebKit_Libraries)\Include;$(WebKit_Libraries)\Include\private;$(WebKit_Libraries)\include\pthreads;$(WebKit_Libraries)\Include\WebCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)\..\..;$(ProjectDir)\..\..\win;$(ConfigurationBuildDir)\Include;$(ConfigurationBuildDir)\Include\private;$(ConfigurationBuildDir)\Include\DumpRenderTree\ForwardingHeaders;$(ConfigurationBuildDir)\Include\_javascript_Core;$(ConfigurationBuildDir)\Include\private\_javascript_Core;$(ConfigurationBuildDir)\Include\WebCoreTestSupport;$(ConfigurationBuildDir)\Include\WebCore;$(WebKit_Libraries)\Include;$(WebKit_Libraries)\Include\private;$(WebKit_Libraries)\Include\WebCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4146;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ForcedIncludeFiles>DumpRenderTreePrefix.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
<Link>
<AdditionalOptions>/NXCOMPAT %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>_javascript_Core$(DebugSuffix).lib;WebKitGUID$(DebugSuffix).lib;WebKit$(DebugSuffix).lib;WebCoreTestSupport$(DebugSuffix).lib;pthreadVC2$(DebugSuffix).lib;gdi32.lib;ole32.lib;oleaut32.lib;user32.lib;shlwapi.lib;oleacc.lib;comsuppw.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>_javascript_Core$(DebugSuffix).lib;WebKitGUID$(DebugSuffix).lib;WebKit$(DebugSuffix).lib;WebCoreTestSupport$(DebugSuffix).lib;gdi32.lib;ole32.lib;oleaut32.lib;user32.lib;shlwapi.lib;oleacc.lib;comsuppw.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Console</SubSystem>
</Link>
</ItemDefinitionGroup>
Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTreeCommon.vsprops (150094 => 150095)
--- trunk/Tools/DumpRenderTree/win/DumpRenderTreeCommon.vsprops 2013-05-15 00:27:36 UTC (rev 150094)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTreeCommon.vsprops 2013-05-15 01:00:26 UTC (rev 150095)
@@ -6,7 +6,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(ProjectDir)\.";"$(ProjectDir)\..";"$(ConfigurationBuildDir)\Include";"$(ConfigurationBuildDir)\Include\private";"$(ConfigurationBuildDir)\Include\DumpRenderTree\ForwardingHeaders";"$(ConfigurationBuildDir)\Include\_javascript_Core";"$(ConfigurationBuildDir)\Include\private\_javascript_Core";"$(ConfigurationBuildDir)\Include\WebCoreTestSupport";"$(WebKitLibrariesDir)\Include";"$(WebKitLibrariesDir)\Include\private";"$(WebKitLibrariesDir)\include\pthreads";"$(ConfigurationBuildDir)\Include\WebCore";"$(WebKitLibrariesDir)\Include\WebCore""
+ AdditionalIncludeDirectories=""$(ProjectDir)\.";"$(ProjectDir)\..";"$(ConfigurationBuildDir)\Include";"$(ConfigurationBuildDir)\Include\private";"$(ConfigurationBuildDir)\Include\DumpRenderTree\ForwardingHeaders";"$(ConfigurationBuildDir)\Include\_javascript_Core";"$(ConfigurationBuildDir)\Include\private\_javascript_Core";"$(ConfigurationBuildDir)\Include\WebCoreTestSupport";"$(WebKitLibrariesDir)\Include";"$(WebKitLibrariesDir)\Include\private";"$(ConfigurationBuildDir)\Include\WebCore";"$(WebKitLibrariesDir)\Include\WebCore""
PreprocessorDefinitions="_CONSOLE"
DisableSpecificWarnings="4146"
ForcedIncludeFiles="DumpRenderTreePrefix.h"
@@ -14,7 +14,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/NXCOMPAT"
- AdditionalDependencies="_javascript_Core$(WebKitDLLConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib WebCoreTestSupport$(WebKitConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib gdi32.lib ole32.lib oleaut32.lib user32.lib shlwapi.lib oleacc.lib comsuppw.lib"
+ AdditionalDependencies="_javascript_Core$(WebKitDLLConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib WebCoreTestSupport$(WebKitConfigSuffix).lib gdi32.lib ole32.lib oleaut32.lib user32.lib shlwapi.lib oleacc.lib comsuppw.lib"
OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll"
SubSystem="1"
/>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
