Title: [153859] trunk
Revision
153859
Author
[email protected]
Date
2013-08-08 16:28:13 -0700 (Thu, 08 Aug 2013)

Log Message

Windows build fixes.

Rubberstamped by Brent Fulgham.

Tools: 

* DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj:
Removed /SAFESEH link option which doesn't work with x64.

WebKitLibraries: 

* win/tools/vsprops/debug_wincairo.props: Removed MinimalRebuild option preventing parallel compiling.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (153858 => 153859)


--- trunk/Tools/ChangeLog	2013-08-08 23:25:47 UTC (rev 153858)
+++ trunk/Tools/ChangeLog	2013-08-08 23:28:13 UTC (rev 153859)
@@ -1,3 +1,12 @@
+2013-08-08  Alex Christensen  <[email protected]>
+
+        Windows build fixes.
+
+        Rubberstamped by Brent Fulgham.
+
+        * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj:
+        Removed /SAFESEH link option which doesn't work with x64.
+
 2013-08-08  Daniel Bates  <[email protected]>
 
         Add iOS support to run-_javascript_core-tests

Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj (153858 => 153859)


--- trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj	2013-08-08 23:25:47 UTC (rev 153858)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj	2013-08-08 23:28:13 UTC (rev 153859)
@@ -162,64 +162,28 @@
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Link>
-      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>
-    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Link>
-      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>
-    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
-    <Link>
-      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>
-    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
-    <Link>
-      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>
-    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">
-    <Link>
-      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>
-    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">
-    <Link>
-      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>
-    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Link>
-      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>
-    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Link>
-      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>
-    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
-    <Link>
-      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>
-    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
-    <Link>
-      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>
-    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
-    <Link>
-      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>
-    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
-    <Link>
-      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>
-    </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\win\DLLLauncher\DLLLauncherMain.cpp" />

Modified: trunk/WebKitLibraries/ChangeLog (153858 => 153859)


--- trunk/WebKitLibraries/ChangeLog	2013-08-08 23:25:47 UTC (rev 153858)
+++ trunk/WebKitLibraries/ChangeLog	2013-08-08 23:28:13 UTC (rev 153859)
@@ -1,3 +1,11 @@
+2013-08-08  Alex Christensen  <[email protected]>
+
+        Windows build fixes.
+
+        Rubberstamped by Brent Fulgham.
+
+        * win/tools/vsprops/debug_wincairo.props: Removed MinimalRebuild option preventing parallel compiling.
+
 2013-07-30  Sanghyun Park  <[email protected]>
 
         Missing the rename REGISTER_PROCOTOL_HANDLER Macro to NAVIGATOR_CONTENT_UTILS in WebKitLibraries.

Modified: trunk/WebKitLibraries/win/tools/vsprops/debug_wincairo.props (153858 => 153859)


--- trunk/WebKitLibraries/win/tools/vsprops/debug_wincairo.props	2013-08-08 23:25:47 UTC (rev 153858)
+++ trunk/WebKitLibraries/win/tools/vsprops/debug_wincairo.props	2013-08-08 23:28:13 UTC (rev 153859)
@@ -14,7 +14,6 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(WebKit_Libraries)\include\cairo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>DEBUG_ALL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     </ClCompile>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to