Changeset 160655 in webkit


Ignore:
Timestamp:
Dec 16, 2013 12:44:01 PM (10 years ago)
Author:
commit-queue@webkit.org
Message:

Fixed Win64 build on VS2013.
​https://bugs.webkit.org/show_bug.cgi?id=125753

Patch by Alex Christensen <​achristensen@webkit.org> on 2013-12-16
Reviewed by Brent Fulgham.

Source/JavaScriptCore:

Added correct PlatformToolset for 64-bit builds.

Source/ThirdParty/ANGLE:

  • ANGLE.vcxproj/libGLESv2.vcxproj:
  • ANGLE.vcxproj/preprocessor.vcxproj:
  • ANGLE.vcxproj/translator_common.vcxproj:
  • ANGLE.vcxproj/translator_glsl.vcxproj:
  • ANGLE.vcxproj/translator_hlsl.vcxproj:

Added correct PlatformToolset for 64-bit builds.

Source/WebCore:

  • WebCore.vcxproj/WebCore.vcxproj:
  • WebCore.vcxproj/WebCoreTestSupport.vcxproj:

Added correct PlatformToolset for 64-bit builds.

Source/WebInspectorUI:

  • WebInspectorUI.vcxproj/WebInspectorUI.vcxproj:

Added 64-bit configuration.

Source/WebKit:

  • WebKit.vcxproj/WebKit.sln:

Use new 64-bit WebInspectorUI configurations.

  • WebKit.vcxproj/Interfaces/Interfaces.vcxproj:
  • WebKit.vcxproj/WebKit/WebKit.vcxproj:
  • WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj:
  • WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj:

Added correct PlatformToolset for 64-bit builds.

Source/WTF:

  • WTF.vcxproj/WTF.vcxproj:

Added correct PlatformToolset for 64-bit builds.

Tools:

  • DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj:
  • DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj:
  • DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiff.vcxproj:
  • DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncher.vcxproj:
  • DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.vcxproj:
  • TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj:
  • WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj:
  • WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj:
  • win/record-memory/record-memory.vcxproj:

Added correct PlatformToolset for 64-bit builds.

Location:
trunk
Files:
43 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r160648 r160655  
     12013-12-16  Alex Christensen  <achristensen@webkit.org>
     2
     3        Fixed Win64 build on VS2013.
     4        https://bugs.webkit.org/show_bug.cgi?id=125753
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
     9        * JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj:
     10        * JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj:
     11        * JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj:
     12        * JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractor.vcxproj:
     13        * JavaScriptCore.vcxproj/jsc/jsc.vcxproj:
     14        * JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj:
     15        * JavaScriptCore.vcxproj/testapi/testapi.vcxproj:
     16        Added correct PlatformToolset for 64-bit builds.
     17
    1182013-12-16  Peter Szanka  <h868064@stud.u-szeged.hu>
    219

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj

    r160557 r160655  
    6868    <CharacterSet>Unicode</CharacterSet>
    6969    <ConfigurationType>DynamicLibrary</ConfigurationType>
     70    <PlatformToolset>v120</PlatformToolset>
    7071  </PropertyGroup>
    7172  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
    … …  
    7980    <CharacterSet>Unicode</CharacterSet>
    8081    <ConfigurationType>DynamicLibrary</ConfigurationType>
     82    <PlatformToolset>v120_xp</PlatformToolset>
    8183  </PropertyGroup>
    8284  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
    … …  
    9092    <CharacterSet>Unicode</CharacterSet>
    9193    <ConfigurationType>DynamicLibrary</ConfigurationType>
     94    <PlatformToolset>v120</PlatformToolset>
    9295  </PropertyGroup>
    9396  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    … …  
    101104    <UseDebugLibraries>false</UseDebugLibraries>
    102105    <CharacterSet>Unicode</CharacterSet>
     106    <PlatformToolset>v120</PlatformToolset>
    103107  </PropertyGroup>
    104108  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
    … …  
    112116    <UseDebugLibraries>false</UseDebugLibraries>
    113117    <CharacterSet>Unicode</CharacterSet>
     118    <PlatformToolset>v120_xp</PlatformToolset>
    114119  </PropertyGroup>
    115120  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
    … …  
    123128    <UseDebugLibraries>false</UseDebugLibraries>
    124129    <CharacterSet>Unicode</CharacterSet>
     130    <PlatformToolset>v120</PlatformToolset>
    125131  </PropertyGroup>
    126132  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    … …  
    13621368    <MASM Include="..\jit\JITStubsMSVC64.asm">
    13631369      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
     1370      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
    13641371      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     1372      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    13651373      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
    13661374      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
    13671375      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
     1376      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
    13681377      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     1378      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    13691379      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
    13701380      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj

    r160564 r160655  
    7070    <ConfigurationType>Makefile</ConfigurationType>
    7171    <UseDebugLibraries>true</UseDebugLibraries>
    72     <PlatformToolset>v120_xp</PlatformToolset>
     72    <PlatformToolset>v120</PlatformToolset>
    7373  </PropertyGroup>
    7474  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
    … …  
    100100    <ConfigurationType>Makefile</ConfigurationType>
    101101    <UseDebugLibraries>false</UseDebugLibraries>
    102     <PlatformToolset>v120_xp</PlatformToolset>
     102    <PlatformToolset>v120</PlatformToolset>
    103103  </PropertyGroup>
    104104  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
    … …  
    120120    <ConfigurationType>Makefile</ConfigurationType>
    121121    <UseDebugLibraries>false</UseDebugLibraries>
    122     <PlatformToolset>v120_xp</PlatformToolset>
     122    <PlatformToolset>v120</PlatformToolset>
    123123  </PropertyGroup>
    124124  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj

    r160563 r160655  
    6363  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    6464    <ConfigurationType>Makefile</ConfigurationType>
    65     <PlatformToolset>v120_xp</PlatformToolset>
     65    <PlatformToolset>v120</PlatformToolset>
    6666  </PropertyGroup>
    6767  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
    … …  
    7979  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
    8080    <ConfigurationType>Makefile</ConfigurationType>
    81     <PlatformToolset>v120_xp</PlatformToolset>
     81    <PlatformToolset>v120</PlatformToolset>
    8282  </PropertyGroup>
    8383  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    … …  
    8787  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    8888    <ConfigurationType>Makefile</ConfigurationType>
    89     <PlatformToolset>v120_xp</PlatformToolset>
     89    <PlatformToolset>v120</PlatformToolset>
    9090  </PropertyGroup>
    9191  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
    … …  
    103103  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
    104104    <ConfigurationType>Makefile</ConfigurationType>
    105     <PlatformToolset>v120_xp</PlatformToolset>
     105    <PlatformToolset>v120</PlatformToolset>
    106106  </PropertyGroup>
    107107  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj

    r160563 r160655  
    6363  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    6464    <ConfigurationType>Makefile</ConfigurationType>
    65     <PlatformToolset>v120_xp</PlatformToolset>
     65    <PlatformToolset>v120</PlatformToolset>
    6666  </PropertyGroup>
    6767  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
    … …  
    7979  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
    8080    <ConfigurationType>Makefile</ConfigurationType>
    81     <PlatformToolset>v120_xp</PlatformToolset>
     81    <PlatformToolset>v120</PlatformToolset>
    8282  </PropertyGroup>
    8383  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    … …  
    8787  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    8888    <ConfigurationType>Makefile</ConfigurationType>
    89     <PlatformToolset>v120_xp</PlatformToolset>
     89    <PlatformToolset>v120</PlatformToolset>
    9090  </PropertyGroup>
    9191  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
    … …  
    103103  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
    104104    <ConfigurationType>Makefile</ConfigurationType>
    105     <PlatformToolset>v120_xp</PlatformToolset>
     105    <PlatformToolset>v120</PlatformToolset>
    106106  </PropertyGroup>
    107107  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractor.vcxproj

    r160548 r160655  
    6767    <ConfigurationType>Application</ConfigurationType>
    6868    <CharacterSet>Unicode</CharacterSet>
     69    <PlatformToolset>v120</PlatformToolset>
    6970  </PropertyGroup>
    7071  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
    … …  
    7677    <ConfigurationType>Application</ConfigurationType>
    7778    <CharacterSet>Unicode</CharacterSet>
     79    <PlatformToolset>v120_xp</PlatformToolset>
    7880  </PropertyGroup>
    7981  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    … …  
    8587    <ConfigurationType>Application</ConfigurationType>
    8688    <CharacterSet>Unicode</CharacterSet>
     89    <PlatformToolset>v120</PlatformToolset>
    8790  </PropertyGroup>
    8891  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
    … …  
    9497    <ConfigurationType>Application</ConfigurationType>
    9598    <CharacterSet>Unicode</CharacterSet>
     99    <PlatformToolset>v120_xp</PlatformToolset>
    96100  </PropertyGroup>
    97101  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
    … …  
    103107    <ConfigurationType>Application</ConfigurationType>
    104108    <CharacterSet>Unicode</CharacterSet>
     109    <PlatformToolset>v120</PlatformToolset>
    105110  </PropertyGroup>
    106111  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
    … …  
    112117    <ConfigurationType>Application</ConfigurationType>
    113118    <CharacterSet>Unicode</CharacterSet>
     119    <PlatformToolset>v120</PlatformToolset>
    114120  </PropertyGroup>
    115121  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jsc.vcxproj

    r160548 r160655  
    6767    <UseDebugLibraries>true</UseDebugLibraries>
    6868    <CharacterSet>Unicode</CharacterSet>
     69    <PlatformToolset>v120</PlatformToolset>
    6970  </PropertyGroup>
    7071  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
    … …  
    7879    <UseDebugLibraries>true</UseDebugLibraries>
    7980    <CharacterSet>Unicode</CharacterSet>
     81    <PlatformToolset>v120_xp</PlatformToolset>
    8082  </PropertyGroup>
    8183  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
    … …  
    8991    <UseDebugLibraries>true</UseDebugLibraries>
    9092    <CharacterSet>Unicode</CharacterSet>
     93    <PlatformToolset>v120</PlatformToolset>
    9194  </PropertyGroup>
    9295  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    … …  
    100103    <UseDebugLibraries>false</UseDebugLibraries>
    101104    <CharacterSet>Unicode</CharacterSet>
     105    <PlatformToolset>v120</PlatformToolset>
    102106  </PropertyGroup>
    103107  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
    … …  
    111115    <UseDebugLibraries>false</UseDebugLibraries>
    112116    <CharacterSet>Unicode</CharacterSet>
     117    <PlatformToolset>v120_xp</PlatformToolset>
    113118  </PropertyGroup>
    114119  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
    … …  
    122127    <UseDebugLibraries>false</UseDebugLibraries>
    123128    <CharacterSet>Unicode</CharacterSet>
     129    <PlatformToolset>v120</PlatformToolset>
    124130  </PropertyGroup>
    125131  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj

    r160548 r160655  
    6868    <UseDebugLibraries>true</UseDebugLibraries>
    6969    <CharacterSet>Unicode</CharacterSet>
     70    <PlatformToolset>v120</PlatformToolset>
    7071  </PropertyGroup>
    7172  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
    … …  
    7980    <UseDebugLibraries>true</UseDebugLibraries>
    8081    <CharacterSet>Unicode</CharacterSet>
     82    <PlatformToolset>v120_xp</PlatformToolset>
    8183  </PropertyGroup>
    8284  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
    … …  
    9092    <UseDebugLibraries>true</UseDebugLibraries>
    9193    <CharacterSet>Unicode</CharacterSet>
     94    <PlatformToolset>v120</PlatformToolset>
    9295  </PropertyGroup>
    9396  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    … …  
    101104    <UseDebugLibraries>false</UseDebugLibraries>
    102105    <CharacterSet>Unicode</CharacterSet>
     106    <PlatformToolset>v120</PlatformToolset>
    103107  </PropertyGroup>
    104108  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
    … …  
    112116    <UseDebugLibraries>false</UseDebugLibraries>
    113117    <CharacterSet>Unicode</CharacterSet>
     118    <PlatformToolset>v120_xp</PlatformToolset>
    114119  </PropertyGroup>
    115120  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
    … …  
    123128    <UseDebugLibraries>false</UseDebugLibraries>
    124129    <CharacterSet>Unicode</CharacterSet>
     130    <PlatformToolset>v120</PlatformToolset>
    125131  </PropertyGroup>
    126132  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapi.vcxproj

    r160548 r160655  
    6767    <UseDebugLibraries>true</UseDebugLibraries>
    6868    <CharacterSet>Unicode</CharacterSet>
     69    <PlatformToolset>v120</PlatformToolset>
    6970  </PropertyGroup>
    7071  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
    … …  
    7879    <UseDebugLibraries>true</UseDebugLibraries>
    7980    <CharacterSet>Unicode</CharacterSet>
     81    <PlatformToolset>v120_xp</PlatformToolset>
    8082  </PropertyGroup>
    8183  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
    … …  
    8991    <UseDebugLibraries>true</UseDebugLibraries>
    9092    <CharacterSet>Unicode</CharacterSet>
     93    <PlatformToolset>v120</PlatformToolset>
    9194  </PropertyGroup>
    9295  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    … …  
    100103    <UseDebugLibraries>false</UseDebugLibraries>
    101104    <CharacterSet>Unicode</CharacterSet>
     105    <PlatformToolset>v120</PlatformToolset>
    102106  </PropertyGroup>
    103107  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
    … …  
    111115    <UseDebugLibraries>false</UseDebugLibraries>
    112116    <CharacterSet>Unicode</CharacterSet>
     117    <PlatformToolset>v120_xp</PlatformToolset>
    113118  </PropertyGroup>
    114119  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
    … …  
    122127    <UseDebugLibraries>false</UseDebugLibraries>
    123128    <CharacterSet>Unicode</CharacterSet>
     129    <PlatformToolset>v120</PlatformToolset>
    124130  </PropertyGroup>
    125131  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  • trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj

    r160574 r160655  
    6464    <CharacterSet>Unicode</CharacterSet>
    6565    <WholeProgramOptimization>true</WholeProgramOptimization>
    66     <PlatformToolset>v120_xp</PlatformToolset>
     66    <PlatformToolset>v120</PlatformToolset>
    6767  </PropertyGroup>
    6868  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    … …  
    8181  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
    8282    <ConfigurationType>DynamicLibrary</ConfigurationType>
    83     <PlatformToolset>v120_xp</PlatformToolset>
     83    <PlatformToolset>v120</PlatformToolset>
    8484  </PropertyGroup>
    8585  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
    … …  
    9393  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
    9494    <ConfigurationType>DynamicLibrary</ConfigurationType>
    95     <PlatformToolset>v120_xp</PlatformToolset>
     95    <PlatformToolset>v120</PlatformToolset>
    9696  </PropertyGroup>
    9797  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  • trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj

    r160574 r160655  
    6161    <ConfigurationType>DynamicLibrary</ConfigurationType>
    6262    <WholeProgramOptimization>true</WholeProgramOptimization>
     63    <PlatformToolset>v120</PlatformToolset>
    6364  </PropertyGroup>
    6465  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    6566    <ConfigurationType>DynamicLibrary</ConfigurationType>
     67    <PlatformToolset>v120</PlatformToolset>
    6668  </PropertyGroup>
    6769  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
    6870    <ConfigurationType>DynamicLibrary</ConfigurationType>
     71    <PlatformToolset>v120_xp</PlatformToolset>
    6972  </PropertyGroup>
    7073  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
    … …  
    8285  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
    8386    <ConfigurationType>DynamicLibrary</ConfigurationType>
     87    <PlatformToolset>v120_xp</PlatformToolset>
    8488  </PropertyGroup>
    8589  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
    8690    <ConfigurationType>DynamicLibrary</ConfigurationType>
     91    <PlatformToolset>v120</PlatformToolset>
    8792  </PropertyGroup>
    8893  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  • trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj

    r160574 r160655  
    5959  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    6060    <ConfigurationType>StaticLibrary</ConfigurationType>
     61    <PlatformToolset>v120</PlatformToolset>
    6162  </PropertyGroup>
    6263  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    6364    <ConfigurationType>StaticLibrary</ConfigurationType>
     65    <PlatformToolset>v120</PlatformToolset>
    6466  </PropertyGroup>
    6567  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
    6668    <ConfigurationType>StaticLibrary</ConfigurationType>
     69    <PlatformToolset>v120_xp</PlatformToolset>
    6770  </PropertyGroup>
    6871  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
    … …  
    7275  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
    7376    <ConfigurationType>StaticLibrary</ConfigurationType>
     77    <PlatformToolset>v120_xp</PlatformToolset>
    7478  </PropertyGroup>
    7579  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
    7680    <ConfigurationType>StaticLibrary</ConfigurationType>
     81    <PlatformToolset>v120</PlatformToolset>
    7782  </PropertyGroup>
    7883  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">

  • trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj

    r160574 r160655  
    5959  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    6060    <ConfigurationType>StaticLibrary</ConfigurationType>
     61    <PlatformToolset>v120</PlatformToolset>
    6162  </PropertyGroup>
    6263  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    6364    <ConfigurationType>StaticLibrary</ConfigurationType>
     65    <PlatformToolset>v120</PlatformToolset>
    6466  </PropertyGroup>
    6567  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
    6668    <ConfigurationType>StaticLibrary</ConfigurationType>
     69    <PlatformToolset>v120_xp</PlatformToolset>
    6770  </PropertyGroup>
    6871  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
    … …  
    7275  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
    7376    <ConfigurationType>StaticLibrary</ConfigurationType>
     77    <PlatformToolset>v120_xp</PlatformToolset>
    7478  </PropertyGroup>
    7579  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
    7680    <ConfigurationType>StaticLibrary</ConfigurationType>
     81    <PlatformToolset>v120</PlatformToolset>
    7782  </PropertyGroup>
    7883  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">

  • trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj

    r160574 r160655  
    5959  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    6060    <ConfigurationType>StaticLibrary</ConfigurationType>
     61    <PlatformToolset>v120</PlatformToolset>
    6162  </PropertyGroup>
    6263  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    6364    <ConfigurationType>StaticLibrary</ConfigurationType>
     65    <PlatformToolset>v120</PlatformToolset>
    6466  </PropertyGroup>
    6567  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
    6668    <ConfigurationType>StaticLibrary</ConfigurationType>
     69    <PlatformToolset>v120_xp</PlatformToolset>
    6770  </PropertyGroup>
    6871  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
    … …  
    7275  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
    7376    <ConfigurationType>StaticLibrary</ConfigurationType>
     77    <PlatformToolset>v120_xp</PlatformToolset>
    7478  </PropertyGroup>
    7579  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
    7680    <ConfigurationType>StaticLibrary</ConfigurationType>
     81    <PlatformToolset>v120</PlatformToolset>
    7782  </PropertyGroup>
    7883  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">

  • trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj

    r160574 r160655  
    5959  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    6060    <ConfigurationType>StaticLibrary</ConfigurationType>
     61    <PlatformToolset>v120</PlatformToolset>
    6162  </PropertyGroup>
    6263  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    6364    <ConfigurationType>StaticLibrary</ConfigurationType>
     65    <PlatformToolset>v120</PlatformToolset>
    6466  </PropertyGroup>
    6567  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
    6668    <ConfigurationType>StaticLibrary</ConfigurationType>
     69    <PlatformToolset>v120_xp</PlatformToolset>
    6770  </PropertyGroup>
    6871  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
    … …  
    7275  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
    7376    <ConfigurationType>StaticLibrary</ConfigurationType>
     77    <PlatformToolset>v120_xp</PlatformToolset>
    7478  </PropertyGroup>
    7579  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
    7680    <ConfigurationType>StaticLibrary</ConfigurationType>
     81    <PlatformToolset>v120</PlatformToolset>
    7782  </PropertyGroup>
    7883  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">

  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r160574 r160655  
     12013-12-16  Alex Christensen  <achristensen@webkit.org>
     2
     3        Fixed Win64 build on VS2013.
     4        https://bugs.webkit.org/show_bug.cgi?id=125753
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * ANGLE.vcxproj/libGLESv2.vcxproj:
     9        * ANGLE.vcxproj/preprocessor.vcxproj:
     10        * ANGLE.vcxproj/translator_common.vcxproj:
     11        * ANGLE.vcxproj/translator_glsl.vcxproj:
     12        * ANGLE.vcxproj/translator_hlsl.vcxproj:
     13        Added correct PlatformToolset for 64-bit builds.
     14
    1152013-12-13  Brent Fulgham  <bfulgham@apple.com>
    216

  • trunk/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj

    r160548 r160655  
    6565    <ConfigurationType>StaticLibrary</ConfigurationType>
    6666    <CharacterSet>MultiByte</CharacterSet>
     67    <PlatformToolset>v120</PlatformToolset>
    6768  </PropertyGroup>
    6869  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
    … …  
    7475    <ConfigurationType>StaticLibrary</ConfigurationType>
    7576    <CharacterSet>MultiByte</CharacterSet>
     77    <PlatformToolset>v120_xp</PlatformToolset>
    7678  </PropertyGroup>
    7779  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
    … …  
    8385    <ConfigurationType>StaticLibrary</ConfigurationType>
    8486    <CharacterSet>MultiByte</CharacterSet>
     87    <PlatformToolset>v120</PlatformToolset>
    8588  </PropertyGroup>
    8689  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    … …  
    9295    <ConfigurationType>StaticLibrary</ConfigurationType>
    9396    <CharacterSet>MultiByte</CharacterSet>
     97    <PlatformToolset>v120</PlatformToolset>
    9498  </PropertyGroup>
    9599  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
    … …  
    101105    <ConfigurationType>StaticLibrary</ConfigurationType>
    102106    <CharacterSet>MultiByte</CharacterSet>
     107    <PlatformToolset>v120_xp</PlatformToolset>
    103108  </PropertyGroup>
    104109  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
    … …  
    110115    <ConfigurationType>StaticLibrary</ConfigurationType>
    111116    <CharacterSet>MultiByte</CharacterSet>
     117    <PlatformToolset>v120</PlatformToolset>
    112118  </PropertyGroup>
    113119  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  • trunk/Source/WTF/ChangeLog

    r160648 r160655  
     12013-12-16  Alex Christensen  <achristensen@webkit.org>
     2
     3        Fixed Win64 build on VS2013.
     4        https://bugs.webkit.org/show_bug.cgi?id=125753
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * WTF.vcxproj/WTF.vcxproj:
     9        Added correct PlatformToolset for 64-bit builds.
     10
    1112013-12-16  Peter Szanka  <h868064@stud.u-szeged.hu>
    212

  • trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj

    r160548 r160655  
    336336    <UseDebugLibraries>true</UseDebugLibraries>
    337337    <CharacterSet>Unicode</CharacterSet>
     338    <PlatformToolset>v120</PlatformToolset>
    338339  </PropertyGroup>
    339340  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
    … …  
    347348    <UseDebugLibraries>true</UseDebugLibraries>
    348349    <CharacterSet>Unicode</CharacterSet>
     350    <PlatformToolset>v120_xp</PlatformToolset>
    349351  </PropertyGroup>
    350352  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
    … …  
    358360    <UseDebugLibraries>true</UseDebugLibraries>
    359361    <CharacterSet>Unicode</CharacterSet>
     362    <PlatformToolset>v120</PlatformToolset>
    360363  </PropertyGroup>
    361364  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    … …  
    369372    <UseDebugLibraries>false</UseDebugLibraries>
    370373    <CharacterSet>Unicode</CharacterSet>
     374    <PlatformToolset>v120</PlatformToolset>
    371375  </PropertyGroup>
    372376  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
    … …  
    380384    <UseDebugLibraries>false</UseDebugLibraries>
    381385    <CharacterSet>Unicode</CharacterSet>
     386    <PlatformToolset>v120_xp</PlatformToolset>
    382387  </PropertyGroup>
    383388  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
    … …  
    391396    <UseDebugLibraries>false</UseDebugLibraries>
    392397    <CharacterSet>Unicode</CharacterSet>
     398    <PlatformToolset>v120</PlatformToolset>
    393399  </PropertyGroup>
    394400  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  • trunk/Source/WTF/WTF.vcxproj/WTFGenerated.vcxproj

    r160563 r160655  
    7070    <ConfigurationType>Makefile</ConfigurationType>
    7171    <UseDebugLibraries>true</UseDebugLibraries>
    72     <PlatformToolset>v120_xp</PlatformToolset>
     72    <PlatformToolset>v120</PlatformToolset>
    7373  </PropertyGroup>
    7474  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
    … …  
    9090    <ConfigurationType>Makefile</ConfigurationType>
    9191    <UseDebugLibraries>true</UseDebugLibraries>
    92     <PlatformToolset>v120_xp</PlatformToolset>
     92    <PlatformToolset>v120</PlatformToolset>
    9393  </PropertyGroup>
    9494  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    … …  
    100100    <ConfigurationType>Makefile</ConfigurationType>
    101101    <UseDebugLibraries>false</UseDebugLibraries>
    102     <PlatformToolset>v120_xp</PlatformToolset>
     102    <PlatformToolset>v120</PlatformToolset>
    103103  </PropertyGroup>
    104104  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
    … …  
    120120    <ConfigurationType>Makefile</ConfigurationType>
    121121    <UseDebugLibraries>false</UseDebugLibraries>
    122     <PlatformToolset>v120_xp</PlatformToolset>
     122    <PlatformToolset>v120</PlatformToolset>
    123123  </PropertyGroup>
    124124  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  • trunk/Source/WebCore/ChangeLog

    r160652 r160655  
     12013-12-16  Alex Christensen  <achristensen@webkit.org>
     2
     3        Fixed Win64 build on VS2013.
     4        https://bugs.webkit.org/show_bug.cgi?id=125753
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * WebCore.vcxproj/WebCore.vcxproj:
     9        * WebCore.vcxproj/WebCoreTestSupport.vcxproj:
     10        Added correct PlatformToolset for 64-bit builds.
     11
    1122013-12-16  Simon Fraser  <simon.fraser@apple.com>
    213

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

    r160577 r160655  
    6565    <ConfigurationType>StaticLibrary</ConfigurationType>
    6666    <CharacterSet>Unicode</CharacterSet>
     67    <PlatformToolset>v120</PlatformToolset>
    6768  </PropertyGroup>
    6869  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
    … …  
    7475    <ConfigurationType>StaticLibrary</ConfigurationType>
    7576    <CharacterSet>Unicode</CharacterSet>
     77    <PlatformToolset>v120_xp</PlatformToolset>
    7678  </PropertyGroup>
    7779  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
    … …  
    8385    <ConfigurationType>StaticLibrary</ConfigurationType>
    8486    <CharacterSet>Unicode</CharacterSet>
     87    <PlatformToolset>v120</PlatformToolset>
    8588  </PropertyGroup>
    8689  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    … …  
    9295    <ConfigurationType>StaticLibrary</ConfigurationType>
    9396    <CharacterSet>Unicode</CharacterSet>
     97    <PlatformToolset>v120</PlatformToolset>
    9498  </PropertyGroup>
    9599  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
    … …  
    101105    <ConfigurationType>StaticLibrary</ConfigurationType>
    102106    <CharacterSet>Unicode</CharacterSet>
     107    <PlatformToolset>v120_xp</PlatformToolset>
    103108  </PropertyGroup>
    104109  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
    … …  
    110115    <ConfigurationType>StaticLibrary</ConfigurationType>
    111116    <CharacterSet>Unicode</CharacterSet>
     117    <PlatformToolset>v120</PlatformToolset>
    112118  </PropertyGroup>
    113119  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  • trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.vcxproj

    r160563 r160655  
    7474    <ConfigurationType>Makefile</ConfigurationType>
    7575    <UseDebugLibraries>true</UseDebugLibraries>
    76     <PlatformToolset>v120_xp</PlatformToolset>
     76    <PlatformToolset>v120</PlatformToolset>
    7777    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
    7878  </PropertyGroup>
    … …  
    9898    <ConfigurationType>Makefile</ConfigurationType>
    9999    <UseDebugLibraries>true</UseDebugLibraries>
    100     <PlatformToolset>v120_xp</PlatformToolset>
     100    <PlatformToolset>v120</PlatformToolset>
    101101    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
    102102  </PropertyGroup>
    … …  
    109109    <ConfigurationType>Makefile</ConfigurationType>
    110110    <UseDebugLibraries>false</UseDebugLibraries>
    111     <PlatformToolset>v120_xp</PlatformToolset>
     111    <PlatformToolset>v120</PlatformToolset>
    112112  </PropertyGroup>
    113113  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
    … …  
    129129    <ConfigurationType>Makefile</ConfigurationType>
    130130    <UseDebugLibraries>false</UseDebugLibraries>
    131     <PlatformToolset>v120_xp</PlatformToolset>
     131    <PlatformToolset>v120</PlatformToolset>
    132132  </PropertyGroup>
    133133  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  • trunk/Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj

    r160548 r160655  
    6565    <ConfigurationType>StaticLibrary</ConfigurationType>
    6666    <CharacterSet>Unicode</CharacterSet>
     67    <PlatformToolset>v120</PlatformToolset>
    6768  </PropertyGroup>
    6869  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
    … …  
    7475    <ConfigurationType>StaticLibrary</ConfigurationType>
    7576    <CharacterSet>Unicode</CharacterSet>
     77    <PlatformToolset>v120_xp</PlatformToolset>
    7678  </PropertyGroup>
    7779  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
    … …  
    8385    <ConfigurationType>StaticLibrary</ConfigurationType>
    8486    <CharacterSet>Unicode</CharacterSet>
     87    <PlatformToolset>v120</PlatformToolset>
    8588  </PropertyGroup>
    8689  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    … …  
    9295    <ConfigurationType>StaticLibrary</ConfigurationType>
    9396    <CharacterSet>Unicode</CharacterSet>
     97    <PlatformToolset>v120</PlatformToolset>
    9498  </PropertyGroup>
    9599  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
    … …  
    101105    <ConfigurationType>StaticLibrary</ConfigurationType>
    102106    <CharacterSet>Unicode</CharacterSet>
     107    <PlatformToolset>v120_xp</PlatformToolset>
    103108  </PropertyGroup>
    104109  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
    … …  
    110115    <ConfigurationType>StaticLibrary</ConfigurationType>
    111116    <CharacterSet>Unicode</CharacterSet>
     117    <PlatformToolset>v120</PlatformToolset>
    112118  </PropertyGroup>
    113119  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  • trunk/Source/WebInspectorUI/ChangeLog

    r160588 r160655  
     12013-12-16  Alex Christensen  <achristensen@webkit.org>
     2
     3        Fixed Win64 build on VS2013.
     4        https://bugs.webkit.org/show_bug.cgi?id=125753
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj:
     9        Added 64-bit configuration.
     10
    1112013-12-13  Joseph Pecoraro  <pecoraro@apple.com>
    212

  • trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj

    r160557 r160655  
    2222      <Platform>Win32</Platform>
    2323    </ProjectConfiguration>
     24    <ProjectConfiguration Include="Debug_WinCairo|x64">
     25      <Configuration>Debug_WinCairo</Configuration>
     26      <Platform>x64</Platform>
     27    </ProjectConfiguration>
     28    <ProjectConfiguration Include="Debug|x64">
     29      <Configuration>Debug</Configuration>
     30      <Platform>x64</Platform>
     31    </ProjectConfiguration>
     32    <ProjectConfiguration Include="Production|x64">
     33      <Configuration>Production</Configuration>
     34      <Platform>x64</Platform>
     35    </ProjectConfiguration>
     36    <ProjectConfiguration Include="Release_WinCairo|x64">
     37      <Configuration>Release_WinCairo</Configuration>
     38      <Platform>x64</Platform>
     39    </ProjectConfiguration>
     40    <ProjectConfiguration Include="Release|x64">
     41      <Configuration>Release</Configuration>
     42      <Platform>x64</Platform>
     43    </ProjectConfiguration>
    2444  </ItemGroup>
    2545  <PropertyGroup Label="Globals">
    … …  
    6181    <PlatformToolset>v120_xp</PlatformToolset>
    6282  </PropertyGroup>
     83  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     84    <ConfigurationType>Application</ConfigurationType>
     85    <UseDebugLibraries>true</UseDebugLibraries>
     86    <CharacterSet>Unicode</CharacterSet>
     87    <PlatformToolset>v120</PlatformToolset>
     88  </PropertyGroup>
     89  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     90    <ConfigurationType>Application</ConfigurationType>
     91    <UseDebugLibraries>false</UseDebugLibraries>
     92    <WholeProgramOptimization>true</WholeProgramOptimization>
     93    <CharacterSet>Unicode</CharacterSet>
     94    <PlatformToolset>v120</PlatformToolset>
     95  </PropertyGroup>
     96  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
     97    <ConfigurationType>Application</ConfigurationType>
     98    <UseDebugLibraries>false</UseDebugLibraries>
     99    <WholeProgramOptimization>true</WholeProgramOptimization>
     100    <CharacterSet>Unicode</CharacterSet>
     101    <PlatformToolset>v120</PlatformToolset>
     102  </PropertyGroup>
     103  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
     104    <ConfigurationType>Application</ConfigurationType>
     105    <UseDebugLibraries>false</UseDebugLibraries>
     106    <WholeProgramOptimization>true</WholeProgramOptimization>
     107    <CharacterSet>MultiByte</CharacterSet>
     108    <PlatformToolset>v120_xp</PlatformToolset>
     109  </PropertyGroup>
     110  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
     111    <ConfigurationType>Application</ConfigurationType>
     112    <UseDebugLibraries>false</UseDebugLibraries>
     113    <CharacterSet>Unicode</CharacterSet>
     114    <PlatformToolset>v120_xp</PlatformToolset>
     115  </PropertyGroup>
    63116  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    64117  <ImportGroup Label="ExtensionSettings">
    … …  
    85138  </ImportGroup>
    86139  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="PropertySheets">
     140    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     141    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     142    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
     143  </ImportGroup>
     144  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     145    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     146    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     147    <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
     148  </ImportGroup>
     149  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     150    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     151    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     152    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />
     153  </ImportGroup>
     154  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="PropertySheets">
     155    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     156    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     157    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />
     158  </ImportGroup>
     159  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="PropertySheets">
     160    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     161    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     162    <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />
     163  </ImportGroup>
     164  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="PropertySheets">
    87165    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    88166    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />

  • trunk/Source/WebKit/ChangeLog

    r160624 r160655  
     12013-12-16  Alex Christensen  <achristensen@webkit.org>
     2
     3        Fixed Win64 build on VS2013.
     4        https://bugs.webkit.org/show_bug.cgi?id=125753
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * WebKit.vcxproj/WebKit.sln:
     9        Use new 64-bit WebInspectorUI configurations.
     10        * WebKit.vcxproj/Interfaces/Interfaces.vcxproj:
     11        * WebKit.vcxproj/WebKit/WebKit.vcxproj:
     12        * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj:
     13        * WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj:
     14        Added correct PlatformToolset for 64-bit builds.
     15
    1162013-12-15  Brent Fulgham  <bfulgham@webkit.org>
    217

  • trunk/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj

    r160548 r160655  
    6666    <ConfigurationType>StaticLibrary</ConfigurationType>
    6767    <CharacterSet>Unicode</CharacterSet>
     68    <PlatformToolset>v120</PlatformToolset>
    6869  </PropertyGroup>
    6970  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
    … …  
    7778    <ConfigurationType>StaticLibrary</ConfigurationType>
    7879    <CharacterSet>Unicode</CharacterSet>
     80    <PlatformToolset>v120_xp</PlatformToolset>
    7981  </PropertyGroup>
    8082  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
    … …  
    8890    <ConfigurationType>StaticLibrary</ConfigurationType>
    8991    <CharacterSet>Unicode</CharacterSet>
     92    <PlatformToolset>v120</PlatformToolset>
    9093  </PropertyGroup>
    9194  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    … …  
    99102    <UseDebugLibraries>false</UseDebugLibraries>
    100103    <CharacterSet>Unicode</CharacterSet>
     104    <PlatformToolset>v120</PlatformToolset>
    101105  </PropertyGroup>
    102106  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
    … …  
    110114    <UseDebugLibraries>false</UseDebugLibraries>
    111115    <CharacterSet>Unicode</CharacterSet>
     116    <PlatformToolset>v120_xp</PlatformToolset>
    112117  </PropertyGroup>
    113118  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
    … …  
    121126    <UseDebugLibraries>false</UseDebugLibraries>
    122127    <CharacterSet>Unicode</CharacterSet>
     128    <PlatformToolset>v120_xp</PlatformToolset>
    123129  </PropertyGroup>
    124130  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  • trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln

    r160624 r160655  
    986986                {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
    987987                {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
    988                 {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug_WinCairo|x64.ActiveCfg = Debug|Win32
     988                {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug_WinCairo|x64.ActiveCfg = Debug|x64
    989989                {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug|Win32.ActiveCfg = Debug|Win32
    990990                {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug|Win32.Build.0 = Debug|Win32
    991                 {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug|x64.ActiveCfg = Debug|Win32
     991                {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug|x64.ActiveCfg = Debug|x64
    992992                {0473724F-0AB3-4F12-892E-9FAB0186C804}.DebugSuffix|Win32.ActiveCfg = Debug|Win32
    993993                {0473724F-0AB3-4F12-892E-9FAB0186C804}.DebugSuffix|Win32.Build.0 = Debug|Win32
    994                 {0473724F-0AB3-4F12-892E-9FAB0186C804}.DebugSuffix|x64.ActiveCfg = Debug|Win32
     994                {0473724F-0AB3-4F12-892E-9FAB0186C804}.DebugSuffix|x64.ActiveCfg = Debug|x64
    995995                {0473724F-0AB3-4F12-892E-9FAB0186C804}.Production|Win32.ActiveCfg = Production|Win32
    996996                {0473724F-0AB3-4F12-892E-9FAB0186C804}.Production|Win32.Build.0 = Production|Win32
    997                 {0473724F-0AB3-4F12-892E-9FAB0186C804}.Production|x64.ActiveCfg = Release|Win32
     997                {0473724F-0AB3-4F12-892E-9FAB0186C804}.Production|x64.ActiveCfg = Release|x64
    998998                {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
    999999                {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
    1000                 {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release_WinCairo|x64.ActiveCfg = Release|Win32
     1000                {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release_WinCairo|x64.ActiveCfg = Release|x64
    10011001                {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release|Win32.ActiveCfg = Release|Win32
    10021002                {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release|Win32.Build.0 = Release|Win32
    1003                 {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release|x64.ActiveCfg = Release|Win32
     1003                {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release|x64.ActiveCfg = Release|x64
    10041004        EndGlobalSection
    10051005        GlobalSection(SolutionProperties) = preSolution

  • trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj

    r160548 r160655  
    6666    <ConfigurationType>DynamicLibrary</ConfigurationType>
    6767    <CharacterSet>Unicode</CharacterSet>
     68    <PlatformToolset>v120</PlatformToolset>
    6869  </PropertyGroup>
    6970  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
    … …  
    7576    <ConfigurationType>DynamicLibrary</ConfigurationType>
    7677    <CharacterSet>Unicode</CharacterSet>
     78    <PlatformToolset>v120_xp</PlatformToolset>
    7779  </PropertyGroup>
    7880  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
    … …  
    8486    <ConfigurationType>DynamicLibrary</ConfigurationType>
    8587    <CharacterSet>Unicode</CharacterSet>
     88    <PlatformToolset>v120</PlatformToolset>
    8689  </PropertyGroup>
    8790  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    … …  
    9396    <ConfigurationType>DynamicLibrary</ConfigurationType>
    9497    <CharacterSet>Unicode</CharacterSet>
     98    <PlatformToolset>v120</PlatformToolset>
    9599  </PropertyGroup>
    96100  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
    … …  
    102106    <ConfigurationType>DynamicLibrary</ConfigurationType>
    103107    <CharacterSet>Unicode</CharacterSet>
     108    <PlatformToolset>v120_xp</PlatformToolset>
    104109  </PropertyGroup>
    105110  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
    … …  
    111116    <ConfigurationType>DynamicLibrary</ConfigurationType>
    112117    <CharacterSet>Unicode</CharacterSet>
     118    <PlatformToolset>v120</PlatformToolset>
    113119  </PropertyGroup>
    114120  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  • trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj

    r160548 r160655  
    6868    <UseDebugLibraries>true</UseDebugLibraries>
    6969    <CharacterSet>Unicode</CharacterSet>
     70    <PlatformToolset>v120</PlatformToolset>
    7071  </PropertyGroup>
    7172  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
    … …  
    7980    <UseDebugLibraries>true</UseDebugLibraries>
    8081    <CharacterSet>Unicode</CharacterSet>
     82    <PlatformToolset>v120_xp</PlatformToolset>
    8183  </PropertyGroup>
    8284  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
    … …  
    9092    <UseDebugLibraries>true</UseDebugLibraries>
    9193    <CharacterSet>Unicode</CharacterSet>
     94    <PlatformToolset>v120</PlatformToolset>
    9295  </PropertyGroup>
    9396  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    … …  
    101104    <UseDebugLibraries>false</UseDebugLibraries>
    102105    <CharacterSet>Unicode</CharacterSet>
     106    <PlatformToolset>v120</PlatformToolset>
    103107  </PropertyGroup>
    104108  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
    … …  
    112116    <UseDebugLibraries>false</UseDebugLibraries>
    113117    <CharacterSet>Unicode</CharacterSet>
     118    <PlatformToolset>v120_xp</PlatformToolset>
    114119  </PropertyGroup>
    115120  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
    … …  
    123128    <UseDebugLibraries>false</UseDebugLibraries>
    124129    <CharacterSet>Unicode</CharacterSet>
     130    <PlatformToolset>v120</PlatformToolset>
    125131  </PropertyGroup>
    126132  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  • trunk/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj

    r160548 r160655  
    6666    <UseDebugLibraries>true</UseDebugLibraries>
    6767    <CharacterSet>Unicode</CharacterSet>
     68    <PlatformToolset>v120</PlatformToolset>
    6869  </PropertyGroup>
    6970  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
    … …  
    7778    <UseDebugLibraries>true</UseDebugLibraries>
    7879    <CharacterSet>Unicode</CharacterSet>
     80    <PlatformToolset>v120</PlatformToolset>
    7981  </PropertyGroup>
    8082  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    … …  
    8890    <UseDebugLibraries>false</UseDebugLibraries>
    8991    <CharacterSet>Unicode</CharacterSet>
     92    <PlatformToolset>v120</PlatformToolset>
    9093  </PropertyGroup>
    9194  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
    … …  
    99102    <UseDebugLibraries>false</UseDebugLibraries>
    100103    <CharacterSet>Unicode</CharacterSet>
     104    <PlatformToolset>v120_xp</PlatformToolset>
    101105  </PropertyGroup>
    102106  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
    … …  
    110114    <UseDebugLibraries>false</UseDebugLibraries>
    111115    <CharacterSet>Unicode</CharacterSet>
     116    <PlatformToolset>v120</PlatformToolset>
    112117  </PropertyGroup>
    113118  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
    … …  
    123128  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
    124129    <CharacterSet>Unicode</CharacterSet>
     130    <PlatformToolset>v120_xp</PlatformToolset>
    125131  </PropertyGroup>
    126132  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  • trunk/Tools/ChangeLog

    r160654 r160655  
     12013-12-16  Alex Christensen  <achristensen@webkit.org>
     2
     3        Fixed Win64 build on VS2013.
     4        https://bugs.webkit.org/show_bug.cgi?id=125753
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj:
     9        * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj:
     10        * DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiff.vcxproj:
     11        * DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncher.vcxproj:
     12        * DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.vcxproj:
     13        * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj:
     14        * WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj:
     15        * WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj:
     16        * win/record-memory/record-memory.vcxproj:
     17        Added correct PlatformToolset for 64-bit builds.
     18
    1192013-12-16  Simon Fraser  <simon.fraser@apple.com>
    220

  • trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj

    r160548 r160655  
    6565    <ConfigurationType>DynamicLibrary</ConfigurationType>
    6666    <CharacterSet>Unicode</CharacterSet>
     67    <PlatformToolset>v120</PlatformToolset>
    6768  </PropertyGroup>
    6869  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
    … …  
    7475    <ConfigurationType>DynamicLibrary</ConfigurationType>
    7576    <CharacterSet>Unicode</CharacterSet>
     77    <PlatformToolset>v120_xp</PlatformToolset>
    7678  </PropertyGroup>
    7779  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
    … …  
    8385    <ConfigurationType>DynamicLibrary</ConfigurationType>
    8486    <CharacterSet>Unicode</CharacterSet>
     87    <PlatformToolset>v120</PlatformToolset>
    8588  </PropertyGroup>
    8689  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    … …  
    9295    <ConfigurationType>DynamicLibrary</ConfigurationType>
    9396    <CharacterSet>Unicode</CharacterSet>
     97    <PlatformToolset>v120</PlatformToolset>
    9498  </PropertyGroup>
    9599  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
    … …  
    101105    <ConfigurationType>DynamicLibrary</ConfigurationType>
    102106    <CharacterSet>Unicode</CharacterSet>
     107    <PlatformToolset>v120_xp</PlatformToolset>
    103108  </PropertyGroup>
    104109  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
    … …  
    110115    <ConfigurationType>DynamicLibrary</ConfigurationType>
    111116    <CharacterSet>Unicode</CharacterSet>
     117    <PlatformToolset>v120</PlatformToolset>
    112118  </PropertyGroup>
    113119  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  • trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj

    r160548 r160655  
    6565    <ConfigurationType>Application</ConfigurationType>
    6666    <CharacterSet>Unicode</CharacterSet>
     67    <PlatformToolset>v120</PlatformToolset>
    6768  </PropertyGroup>
    6869  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
    … …  
    7475    <ConfigurationType>Application</ConfigurationType>
    7576    <CharacterSet>Unicode</CharacterSet>
     77    <PlatformToolset>v120_xp</PlatformToolset>
    7678  </PropertyGroup>
    7779  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
    … …  
    8385    <ConfigurationType>Application</ConfigurationType>
    8486    <CharacterSet>Unicode</CharacterSet>
     87    <PlatformToolset>v120</PlatformToolset>
    8588  </PropertyGroup>
    8689  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    … …  
    9295    <ConfigurationType>Application</ConfigurationType>
    9396    <CharacterSet>Unicode</CharacterSet>
     97    <PlatformToolset>v120</PlatformToolset>
    9498  </PropertyGroup>
    9599  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
    … …  
    101105    <ConfigurationType>Application</ConfigurationType>
    102106    <CharacterSet>Unicode</CharacterSet>
     107    <PlatformToolset>v120_xp</PlatformToolset>
    103108  </PropertyGroup>
    104109  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
    … …  
    110115    <ConfigurationType>Application</ConfigurationType>
    111116    <CharacterSet>Unicode</CharacterSet>
     117    <PlatformToolset>v120</PlatformToolset>
    112118  </PropertyGroup>
    113119  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  • trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiff.vcxproj

    r160548 r160655  
    6464    <ConfigurationType>DynamicLibrary</ConfigurationType>
    6565    <CharacterSet>Unicode</CharacterSet>
     66    <PlatformToolset>v120</PlatformToolset>
    6667  </PropertyGroup>
    6768  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
    … …  
    7374    <ConfigurationType>DynamicLibrary</ConfigurationType>
    7475    <CharacterSet>Unicode</CharacterSet>
     76    <PlatformToolset>v120_xp</PlatformToolset>
    7577  </PropertyGroup>
    7678  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
    … …  
    8284    <ConfigurationType>DynamicLibrary</ConfigurationType>
    8385    <CharacterSet>Unicode</CharacterSet>
     86    <PlatformToolset>v120</PlatformToolset>
    8487  </PropertyGroup>
    8588  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    … …  
    9194    <ConfigurationType>DynamicLibrary</ConfigurationType>
    9295    <CharacterSet>Unicode</CharacterSet>
     96    <PlatformToolset>v120</PlatformToolset>
    9397  </PropertyGroup>
    9498  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
    … …  
    100104    <ConfigurationType>DynamicLibrary</ConfigurationType>
    101105    <CharacterSet>Unicode</CharacterSet>
     106    <PlatformToolset>v120_xp</PlatformToolset>
    102107  </PropertyGroup>
    103108  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
    … …  
    109114    <ConfigurationType>DynamicLibrary</ConfigurationType>
    110115    <CharacterSet>Unicode</CharacterSet>
     116    <PlatformToolset>v120</PlatformToolset>
    111117  </PropertyGroup>
    112118  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  • trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncher.vcxproj

    r160548 r160655  
    6565    <ConfigurationType>Application</ConfigurationType>
    6666    <CharacterSet>Unicode</CharacterSet>
     67    <PlatformToolset>v120</PlatformToolset>
    6768  </PropertyGroup>
    6869  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
    … …  
    7475    <ConfigurationType>Application</ConfigurationType>
    7576    <CharacterSet>Unicode</CharacterSet>
     77    <PlatformToolset>v120_xp</PlatformToolset>
    7678  </PropertyGroup>
    7779  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
    … …  
    8385    <ConfigurationType>Application</ConfigurationType>
    8486    <CharacterSet>Unicode</CharacterSet>
     87    <PlatformToolset>v120</PlatformToolset>
    8588  </PropertyGroup>
    8689  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    … …  
    9295    <ConfigurationType>Application</ConfigurationType>
    9396    <CharacterSet>Unicode</CharacterSet>
     97    <PlatformToolset>v120</PlatformToolset>
    9498  </PropertyGroup>
    9599  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
    … …  
    101105    <ConfigurationType>Application</ConfigurationType>
    102106    <CharacterSet>Unicode</CharacterSet>
     107    <PlatformToolset>v120_xp</PlatformToolset>
    103108  </PropertyGroup>
    104109  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
    … …  
    110115    <ConfigurationType>Application</ConfigurationType>
    111116    <CharacterSet>Unicode</CharacterSet>
     117    <PlatformToolset>v120</PlatformToolset>
    112118  </PropertyGroup>
    113119  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  • trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.vcxproj

    r160548 r160655  
    117117    <ConfigurationType>DynamicLibrary</ConfigurationType>
    118118    <CharacterSet>Unicode</CharacterSet>
     119    <PlatformToolset>v120</PlatformToolset>
    119120  </PropertyGroup>
    120121  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
    … …  
    126127    <ConfigurationType>DynamicLibrary</ConfigurationType>
    127128    <CharacterSet>Unicode</CharacterSet>
     129    <PlatformToolset>v120_xp</PlatformToolset>
    128130  </PropertyGroup>
    129131  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
    … …  
    135137    <ConfigurationType>DynamicLibrary</ConfigurationType>
    136138    <CharacterSet>Unicode</CharacterSet>
     139    <PlatformToolset>v120</PlatformToolset>
    137140  </PropertyGroup>
    138141  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    … …  
    144147    <ConfigurationType>DynamicLibrary</ConfigurationType>
    145148    <CharacterSet>Unicode</CharacterSet>
     149    <PlatformToolset>v120</PlatformToolset>
    146150  </PropertyGroup>
    147151  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
    … …  
    153157    <ConfigurationType>DynamicLibrary</ConfigurationType>
    154158    <CharacterSet>Unicode</CharacterSet>
     159    <PlatformToolset>v120_xp</PlatformToolset>
    155160  </PropertyGroup>
    156161  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
    … …  
    162167    <ConfigurationType>DynamicLibrary</ConfigurationType>
    163168    <CharacterSet>Unicode</CharacterSet>
     169    <PlatformToolset>v120</PlatformToolset>
    164170  </PropertyGroup>
    165171  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  • trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj

    r160548 r160655  
    6767    <UseDebugLibraries>true</UseDebugLibraries>
    6868    <CharacterSet>Unicode</CharacterSet>
     69    <PlatformToolset>v120</PlatformToolset>
    6970  </PropertyGroup>
    7071  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
    … …  
    7879    <UseDebugLibraries>true</UseDebugLibraries>
    7980    <CharacterSet>Unicode</CharacterSet>
     81    <PlatformToolset>v120_xp</PlatformToolset>
    8082  </PropertyGroup>
    8183  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
    … …  
    8991    <UseDebugLibraries>true</UseDebugLibraries>
    9092    <CharacterSet>Unicode</CharacterSet>
     93    <PlatformToolset>v120</PlatformToolset>
    9194  </PropertyGroup>
    9295  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    … …  
    100103    <UseDebugLibraries>false</UseDebugLibraries>
    101104    <CharacterSet>Unicode</CharacterSet>
     105    <PlatformToolset>v120</PlatformToolset>
    102106  </PropertyGroup>
    103107  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
    … …  
    111115    <UseDebugLibraries>false</UseDebugLibraries>
    112116    <CharacterSet>Unicode</CharacterSet>
     117    <PlatformToolset>v120_xp</PlatformToolset>
    113118  </PropertyGroup>
    114119  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
    … …  
    122127    <UseDebugLibraries>false</UseDebugLibraries>
    123128    <CharacterSet>Unicode</CharacterSet>
     129    <PlatformToolset>v120</PlatformToolset>
    124130  </PropertyGroup>
    125131  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  • trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj

    r160548 r160655  
    6565    <ConfigurationType>Application</ConfigurationType>
    6666    <CharacterSet>Unicode</CharacterSet>
     67    <PlatformToolset>v120</PlatformToolset>
    6768  </PropertyGroup>
    6869  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
    … …  
    7475    <ConfigurationType>Application</ConfigurationType>
    7576    <CharacterSet>Unicode</CharacterSet>
     77    <PlatformToolset>v120_xp</PlatformToolset>
    7678  </PropertyGroup>
    7779  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
    … …  
    8385    <ConfigurationType>Application</ConfigurationType>
    8486    <CharacterSet>Unicode</CharacterSet>
     87    <PlatformToolset>v120</PlatformToolset>
    8588  </PropertyGroup>
    8689  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    … …  
    9295    <ConfigurationType>Application</ConfigurationType>
    9396    <CharacterSet>Unicode</CharacterSet>
     97    <PlatformToolset>v120</PlatformToolset>
    9498  </PropertyGroup>
    9599  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
    … …  
    101105    <ConfigurationType>Application</ConfigurationType>
    102106    <CharacterSet>Unicode</CharacterSet>
     107    <PlatformToolset>v120_xp</PlatformToolset>
    103108  </PropertyGroup>
    104109  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
    … …  
    110115    <ConfigurationType>Application</ConfigurationType>
    111116    <CharacterSet>Unicode</CharacterSet>
     117    <PlatformToolset>v120</PlatformToolset>
    112118  </PropertyGroup>
    113119  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  • trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj

    r160548 r160655  
    6565    <ConfigurationType>DynamicLibrary</ConfigurationType>
    6666    <CharacterSet>Unicode</CharacterSet>
     67    <PlatformToolset>v120</PlatformToolset>
    6768  </PropertyGroup>
    6869  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
    … …  
    7475    <ConfigurationType>DynamicLibrary</ConfigurationType>
    7576    <CharacterSet>Unicode</CharacterSet>
     77    <PlatformToolset>v120_xp</PlatformToolset>
    7678  </PropertyGroup>
    7779  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
    … …  
    8385    <ConfigurationType>DynamicLibrary</ConfigurationType>
    8486    <CharacterSet>Unicode</CharacterSet>
     87    <PlatformToolset>v120</PlatformToolset>
    8588  </PropertyGroup>
    8689  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    … …  
    9295    <ConfigurationType>DynamicLibrary</ConfigurationType>
    9396    <CharacterSet>Unicode</CharacterSet>
     97    <PlatformToolset>v120</PlatformToolset>
    9498  </PropertyGroup>
    9599  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
    … …  
    101105    <ConfigurationType>DynamicLibrary</ConfigurationType>
    102106    <CharacterSet>Unicode</CharacterSet>
     107    <PlatformToolset>v120_xp</PlatformToolset>
    103108  </PropertyGroup>
    104109  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
    … …  
    110115    <ConfigurationType>DynamicLibrary</ConfigurationType>
    111116    <CharacterSet>Unicode</CharacterSet>
     117    <PlatformToolset>v120</PlatformToolset>
    112118  </PropertyGroup>
    113119  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  • trunk/Tools/win/AssembleBuildLogs/AssembleBuildLogs.vcxproj

    r160563 r160655  
    5656    <ConfigurationType>Makefile</ConfigurationType>
    5757    <UseDebugLibraries>true</UseDebugLibraries>
    58     <PlatformToolset>v120_xp</PlatformToolset>
     58    <PlatformToolset>v120</PlatformToolset>
    5959  </PropertyGroup>
    6060  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
    … …  
    7676    <ConfigurationType>Makefile</ConfigurationType>
    7777    <UseDebugLibraries>false</UseDebugLibraries>
    78     <PlatformToolset>v120_xp</PlatformToolset>
     78    <PlatformToolset>v120</PlatformToolset>
    7979  </PropertyGroup>
    8080  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
    … …  
    9696    <ConfigurationType>Makefile</ConfigurationType>
    9797    <UseDebugLibraries>false</UseDebugLibraries>
    98     <PlatformToolset>v120_xp</PlatformToolset>
     98    <PlatformToolset>v120</PlatformToolset>
    9999  </PropertyGroup>
    100100  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  • trunk/Tools/win/record-memory/record-memory.vcxproj

    r160548 r160655  
    6767    <UseDebugLibraries>true</UseDebugLibraries>
    6868    <CharacterSet>Unicode</CharacterSet>
     69    <PlatformToolset>v120</PlatformToolset>
    6970  </PropertyGroup>
    7071  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
    … …  
    7879    <UseDebugLibraries>true</UseDebugLibraries>
    7980    <CharacterSet>Unicode</CharacterSet>
     81    <PlatformToolset>v120_xp</PlatformToolset>
    8082  </PropertyGroup>
    8183  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
    … …  
    8991    <UseDebugLibraries>true</UseDebugLibraries>
    9092    <CharacterSet>Unicode</CharacterSet>
     93    <PlatformToolset>v120</PlatformToolset>
    9194  </PropertyGroup>
    9295  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    … …  
    100103    <UseDebugLibraries>false</UseDebugLibraries>
    101104    <CharacterSet>Unicode</CharacterSet>
     105    <PlatformToolset>v120</PlatformToolset>
    102106  </PropertyGroup>
    103107  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
    … …  
    111115    <UseDebugLibraries>false</UseDebugLibraries>
    112116    <CharacterSet>Unicode</CharacterSet>
     117    <PlatformToolset>v120_xp</PlatformToolset>
    113118  </PropertyGroup>
    114119  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
    … …  
    122127    <UseDebugLibraries>false</UseDebugLibraries>
    123128    <CharacterSet>Unicode</CharacterSet>
     129    <PlatformToolset>v120</PlatformToolset>
    124130  </PropertyGroup>
    125131  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
Note: See TracChangeset for help on using the changeset viewer.