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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@153859 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 30a085634fac80b89bdac1634551c6838f12c513..4c7b3d92c1213cc571e438e26254af3807f9d9d3 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,12 @@
+2013-08-08  Alex Christensen  <achristensen@apple.com>
+
+        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  <dabates@apple.com>
 
         Add iOS support to run-javascriptcore-tests

diff --git a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj
index 44a9b37936f3d1572f2b1037c3d1d897e53dcd21..d0f946dfa227b46366a4fd2c759e0c52d8fefcb6 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj
+++ b/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj
@@ -162,64 +162,28 @@
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <Link>\r
-      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>\r
-    </Link>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <Link>\r
-      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>\r
-    </Link>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">\r
-    <Link>\r
-      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>\r
-    </Link>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">\r
-    <Link>\r
-      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>\r
-    </Link>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">\r
-    <Link>\r
-      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>\r
-    </Link>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">\r
-    <Link>\r
-      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>\r
-    </Link>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <Link>\r
-      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>\r
-    </Link>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <Link>\r
-      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>\r
-    </Link>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">\r
-    <Link>\r
-      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>\r
-    </Link>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">\r
-    <Link>\r
-      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>\r
-    </Link>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">\r
-    <Link>\r
-      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>\r
-    </Link>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'">\r
-    <Link>\r
-      <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>\r
-    </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
     <ClCompile Include="..\..\..\win\DLLLauncher\DLLLauncherMain.cpp" />\r

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index bc21f5114819c76fdace5394f2ba8f580db06f21..00dd9c3aaf56b9d48a243654a4b76db88e791319 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,11 @@
+2013-08-08  Alex Christensen  <achristensen@apple.com>
+
+        Windows build fixes.
+
+        Rubberstamped by Brent Fulgham.
+
+        * win/tools/vsprops/debug_wincairo.props: Removed MinimalRebuild option preventing parallel compiling.
+
 2013-07-30  Sanghyun Park  <sh919.park@samsung.com>
 
         Missing the rename REGISTER_PROCOTOL_HANDLER Macro to NAVIGATOR_CONTENT_UTILS in WebKitLibraries.

diff --git a/WebKitLibraries/win/tools/vsprops/debug_wincairo.props b/WebKitLibraries/win/tools/vsprops/debug_wincairo.props
index c7f3d8f6d962f3797fce649829a616066a645646..0d709fbefcefb2e3901c3c849b5a82802045ae12 100644 (file)
--- a/WebKitLibraries/win/tools/vsprops/debug_wincairo.props
+++ b/WebKitLibraries/win/tools/vsprops/debug_wincairo.props
@@ -14,7 +14,6 @@
       <Optimization>Disabled</Optimization>\r
       <AdditionalIncludeDirectories>$(WebKit_Libraries)\include\cairo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>DEBUG_ALL;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
     </ClCompile>\r