Changeset 160655 in webkit
- Timestamp:
- Dec 16, 2013 12:44:01 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 43 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r160648 r160655 1 2013-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 1 18 2013-12-16 Peter Szanka <h868064@stud.u-szeged.hu> 2 19 -
trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj
r160557 r160655 68 68 <CharacterSet>Unicode</CharacterSet> 69 69 <ConfigurationType>DynamicLibrary</ConfigurationType> 70 <PlatformToolset>v120</PlatformToolset> 70 71 </PropertyGroup> 71 72 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration"> … … 79 80 <CharacterSet>Unicode</CharacterSet> 80 81 <ConfigurationType>DynamicLibrary</ConfigurationType> 82 <PlatformToolset>v120_xp</PlatformToolset> 81 83 </PropertyGroup> 82 84 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration"> … … 90 92 <CharacterSet>Unicode</CharacterSet> 91 93 <ConfigurationType>DynamicLibrary</ConfigurationType> 94 <PlatformToolset>v120</PlatformToolset> 92 95 </PropertyGroup> 93 96 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> … … 101 104 <UseDebugLibraries>false</UseDebugLibraries> 102 105 <CharacterSet>Unicode</CharacterSet> 106 <PlatformToolset>v120</PlatformToolset> 103 107 </PropertyGroup> 104 108 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration"> … … 112 116 <UseDebugLibraries>false</UseDebugLibraries> 113 117 <CharacterSet>Unicode</CharacterSet> 118 <PlatformToolset>v120_xp</PlatformToolset> 114 119 </PropertyGroup> 115 120 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration"> … … 123 128 <UseDebugLibraries>false</UseDebugLibraries> 124 129 <CharacterSet>Unicode</CharacterSet> 130 <PlatformToolset>v120</PlatformToolset> 125 131 </PropertyGroup> 126 132 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> … … 1362 1368 <MASM Include="..\jit\JITStubsMSVC64.asm"> 1363 1369 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild> 1370 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild> 1364 1371 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 1372 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 1365 1373 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild> 1366 1374 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild> 1367 1375 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild> 1376 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild> 1368 1377 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 1378 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 1369 1379 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild> 1370 1380 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild> -
trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj
r160564 r160655 70 70 <ConfigurationType>Makefile</ConfigurationType> 71 71 <UseDebugLibraries>true</UseDebugLibraries> 72 <PlatformToolset>v120 _xp</PlatformToolset>72 <PlatformToolset>v120</PlatformToolset> 73 73 </PropertyGroup> 74 74 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration"> … … 100 100 <ConfigurationType>Makefile</ConfigurationType> 101 101 <UseDebugLibraries>false</UseDebugLibraries> 102 <PlatformToolset>v120 _xp</PlatformToolset>102 <PlatformToolset>v120</PlatformToolset> 103 103 </PropertyGroup> 104 104 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration"> … … 120 120 <ConfigurationType>Makefile</ConfigurationType> 121 121 <UseDebugLibraries>false</UseDebugLibraries> 122 <PlatformToolset>v120 _xp</PlatformToolset>122 <PlatformToolset>v120</PlatformToolset> 123 123 </PropertyGroup> 124 124 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -
trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj
r160563 r160655 63 63 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 64 64 <ConfigurationType>Makefile</ConfigurationType> 65 <PlatformToolset>v120 _xp</PlatformToolset>65 <PlatformToolset>v120</PlatformToolset> 66 66 </PropertyGroup> 67 67 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration"> … … 79 79 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration"> 80 80 <ConfigurationType>Makefile</ConfigurationType> 81 <PlatformToolset>v120 _xp</PlatformToolset>81 <PlatformToolset>v120</PlatformToolset> 82 82 </PropertyGroup> 83 83 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> … … 87 87 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 88 88 <ConfigurationType>Makefile</ConfigurationType> 89 <PlatformToolset>v120 _xp</PlatformToolset>89 <PlatformToolset>v120</PlatformToolset> 90 90 </PropertyGroup> 91 91 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration"> … … 103 103 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration"> 104 104 <ConfigurationType>Makefile</ConfigurationType> 105 <PlatformToolset>v120 _xp</PlatformToolset>105 <PlatformToolset>v120</PlatformToolset> 106 106 </PropertyGroup> 107 107 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -
trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj
r160563 r160655 63 63 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 64 64 <ConfigurationType>Makefile</ConfigurationType> 65 <PlatformToolset>v120 _xp</PlatformToolset>65 <PlatformToolset>v120</PlatformToolset> 66 66 </PropertyGroup> 67 67 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration"> … … 79 79 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration"> 80 80 <ConfigurationType>Makefile</ConfigurationType> 81 <PlatformToolset>v120 _xp</PlatformToolset>81 <PlatformToolset>v120</PlatformToolset> 82 82 </PropertyGroup> 83 83 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> … … 87 87 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 88 88 <ConfigurationType>Makefile</ConfigurationType> 89 <PlatformToolset>v120 _xp</PlatformToolset>89 <PlatformToolset>v120</PlatformToolset> 90 90 </PropertyGroup> 91 91 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration"> … … 103 103 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration"> 104 104 <ConfigurationType>Makefile</ConfigurationType> 105 <PlatformToolset>v120 _xp</PlatformToolset>105 <PlatformToolset>v120</PlatformToolset> 106 106 </PropertyGroup> 107 107 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -
trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractor.vcxproj
r160548 r160655 67 67 <ConfigurationType>Application</ConfigurationType> 68 68 <CharacterSet>Unicode</CharacterSet> 69 <PlatformToolset>v120</PlatformToolset> 69 70 </PropertyGroup> 70 71 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration"> … … 76 77 <ConfigurationType>Application</ConfigurationType> 77 78 <CharacterSet>Unicode</CharacterSet> 79 <PlatformToolset>v120_xp</PlatformToolset> 78 80 </PropertyGroup> 79 81 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> … … 85 87 <ConfigurationType>Application</ConfigurationType> 86 88 <CharacterSet>Unicode</CharacterSet> 89 <PlatformToolset>v120</PlatformToolset> 87 90 </PropertyGroup> 88 91 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration"> … … 94 97 <ConfigurationType>Application</ConfigurationType> 95 98 <CharacterSet>Unicode</CharacterSet> 99 <PlatformToolset>v120_xp</PlatformToolset> 96 100 </PropertyGroup> 97 101 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration"> … … 103 107 <ConfigurationType>Application</ConfigurationType> 104 108 <CharacterSet>Unicode</CharacterSet> 109 <PlatformToolset>v120</PlatformToolset> 105 110 </PropertyGroup> 106 111 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration"> … … 112 117 <ConfigurationType>Application</ConfigurationType> 113 118 <CharacterSet>Unicode</CharacterSet> 119 <PlatformToolset>v120</PlatformToolset> 114 120 </PropertyGroup> 115 121 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -
trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jsc.vcxproj
r160548 r160655 67 67 <UseDebugLibraries>true</UseDebugLibraries> 68 68 <CharacterSet>Unicode</CharacterSet> 69 <PlatformToolset>v120</PlatformToolset> 69 70 </PropertyGroup> 70 71 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration"> … … 78 79 <UseDebugLibraries>true</UseDebugLibraries> 79 80 <CharacterSet>Unicode</CharacterSet> 81 <PlatformToolset>v120_xp</PlatformToolset> 80 82 </PropertyGroup> 81 83 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration"> … … 89 91 <UseDebugLibraries>true</UseDebugLibraries> 90 92 <CharacterSet>Unicode</CharacterSet> 93 <PlatformToolset>v120</PlatformToolset> 91 94 </PropertyGroup> 92 95 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> … … 100 103 <UseDebugLibraries>false</UseDebugLibraries> 101 104 <CharacterSet>Unicode</CharacterSet> 105 <PlatformToolset>v120</PlatformToolset> 102 106 </PropertyGroup> 103 107 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration"> … … 111 115 <UseDebugLibraries>false</UseDebugLibraries> 112 116 <CharacterSet>Unicode</CharacterSet> 117 <PlatformToolset>v120_xp</PlatformToolset> 113 118 </PropertyGroup> 114 119 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration"> … … 122 127 <UseDebugLibraries>false</UseDebugLibraries> 123 128 <CharacterSet>Unicode</CharacterSet> 129 <PlatformToolset>v120</PlatformToolset> 124 130 </PropertyGroup> 125 131 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -
trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj
r160548 r160655 68 68 <UseDebugLibraries>true</UseDebugLibraries> 69 69 <CharacterSet>Unicode</CharacterSet> 70 <PlatformToolset>v120</PlatformToolset> 70 71 </PropertyGroup> 71 72 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration"> … … 79 80 <UseDebugLibraries>true</UseDebugLibraries> 80 81 <CharacterSet>Unicode</CharacterSet> 82 <PlatformToolset>v120_xp</PlatformToolset> 81 83 </PropertyGroup> 82 84 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration"> … … 90 92 <UseDebugLibraries>true</UseDebugLibraries> 91 93 <CharacterSet>Unicode</CharacterSet> 94 <PlatformToolset>v120</PlatformToolset> 92 95 </PropertyGroup> 93 96 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> … … 101 104 <UseDebugLibraries>false</UseDebugLibraries> 102 105 <CharacterSet>Unicode</CharacterSet> 106 <PlatformToolset>v120</PlatformToolset> 103 107 </PropertyGroup> 104 108 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration"> … … 112 116 <UseDebugLibraries>false</UseDebugLibraries> 113 117 <CharacterSet>Unicode</CharacterSet> 118 <PlatformToolset>v120_xp</PlatformToolset> 114 119 </PropertyGroup> 115 120 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration"> … … 123 128 <UseDebugLibraries>false</UseDebugLibraries> 124 129 <CharacterSet>Unicode</CharacterSet> 130 <PlatformToolset>v120</PlatformToolset> 125 131 </PropertyGroup> 126 132 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -
trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapi.vcxproj
r160548 r160655 67 67 <UseDebugLibraries>true</UseDebugLibraries> 68 68 <CharacterSet>Unicode</CharacterSet> 69 <PlatformToolset>v120</PlatformToolset> 69 70 </PropertyGroup> 70 71 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration"> … … 78 79 <UseDebugLibraries>true</UseDebugLibraries> 79 80 <CharacterSet>Unicode</CharacterSet> 81 <PlatformToolset>v120_xp</PlatformToolset> 80 82 </PropertyGroup> 81 83 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration"> … … 89 91 <UseDebugLibraries>true</UseDebugLibraries> 90 92 <CharacterSet>Unicode</CharacterSet> 93 <PlatformToolset>v120</PlatformToolset> 91 94 </PropertyGroup> 92 95 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> … … 100 103 <UseDebugLibraries>false</UseDebugLibraries> 101 104 <CharacterSet>Unicode</CharacterSet> 105 <PlatformToolset>v120</PlatformToolset> 102 106 </PropertyGroup> 103 107 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration"> … … 111 115 <UseDebugLibraries>false</UseDebugLibraries> 112 116 <CharacterSet>Unicode</CharacterSet> 117 <PlatformToolset>v120_xp</PlatformToolset> 113 118 </PropertyGroup> 114 119 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration"> … … 122 127 <UseDebugLibraries>false</UseDebugLibraries> 123 128 <CharacterSet>Unicode</CharacterSet> 129 <PlatformToolset>v120</PlatformToolset> 124 130 </PropertyGroup> 125 131 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -
trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj
r160574 r160655 64 64 <CharacterSet>Unicode</CharacterSet> 65 65 <WholeProgramOptimization>true</WholeProgramOptimization> 66 <PlatformToolset>v120 _xp</PlatformToolset>66 <PlatformToolset>v120</PlatformToolset> 67 67 </PropertyGroup> 68 68 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> … … 81 81 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'"> 82 82 <ConfigurationType>DynamicLibrary</ConfigurationType> 83 <PlatformToolset>v120 _xp</PlatformToolset>83 <PlatformToolset>v120</PlatformToolset> 84 84 </PropertyGroup> 85 85 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'"> … … 93 93 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|x64'"> 94 94 <ConfigurationType>DynamicLibrary</ConfigurationType> 95 <PlatformToolset>v120 _xp</PlatformToolset>95 <PlatformToolset>v120</PlatformToolset> 96 96 </PropertyGroup> 97 97 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -
trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj
r160574 r160655 61 61 <ConfigurationType>DynamicLibrary</ConfigurationType> 62 62 <WholeProgramOptimization>true</WholeProgramOptimization> 63 <PlatformToolset>v120</PlatformToolset> 63 64 </PropertyGroup> 64 65 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 65 66 <ConfigurationType>DynamicLibrary</ConfigurationType> 67 <PlatformToolset>v120</PlatformToolset> 66 68 </PropertyGroup> 67 69 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'"> 68 70 <ConfigurationType>DynamicLibrary</ConfigurationType> 71 <PlatformToolset>v120_xp</PlatformToolset> 69 72 </PropertyGroup> 70 73 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'"> … … 82 85 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'"> 83 86 <ConfigurationType>DynamicLibrary</ConfigurationType> 87 <PlatformToolset>v120_xp</PlatformToolset> 84 88 </PropertyGroup> 85 89 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|x64'"> 86 90 <ConfigurationType>DynamicLibrary</ConfigurationType> 91 <PlatformToolset>v120</PlatformToolset> 87 92 </PropertyGroup> 88 93 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -
trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj
r160574 r160655 59 59 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 60 60 <ConfigurationType>StaticLibrary</ConfigurationType> 61 <PlatformToolset>v120</PlatformToolset> 61 62 </PropertyGroup> 62 63 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 63 64 <ConfigurationType>StaticLibrary</ConfigurationType> 65 <PlatformToolset>v120</PlatformToolset> 64 66 </PropertyGroup> 65 67 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'"> 66 68 <ConfigurationType>StaticLibrary</ConfigurationType> 69 <PlatformToolset>v120_xp</PlatformToolset> 67 70 </PropertyGroup> 68 71 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'"> … … 72 75 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'"> 73 76 <ConfigurationType>StaticLibrary</ConfigurationType> 77 <PlatformToolset>v120_xp</PlatformToolset> 74 78 </PropertyGroup> 75 79 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|x64'"> 76 80 <ConfigurationType>StaticLibrary</ConfigurationType> 81 <PlatformToolset>v120</PlatformToolset> 77 82 </PropertyGroup> 78 83 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'"> -
trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj
r160574 r160655 59 59 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 60 60 <ConfigurationType>StaticLibrary</ConfigurationType> 61 <PlatformToolset>v120</PlatformToolset> 61 62 </PropertyGroup> 62 63 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 63 64 <ConfigurationType>StaticLibrary</ConfigurationType> 65 <PlatformToolset>v120</PlatformToolset> 64 66 </PropertyGroup> 65 67 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'"> 66 68 <ConfigurationType>StaticLibrary</ConfigurationType> 69 <PlatformToolset>v120_xp</PlatformToolset> 67 70 </PropertyGroup> 68 71 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'"> … … 72 75 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'"> 73 76 <ConfigurationType>StaticLibrary</ConfigurationType> 77 <PlatformToolset>v120_xp</PlatformToolset> 74 78 </PropertyGroup> 75 79 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|x64'"> 76 80 <ConfigurationType>StaticLibrary</ConfigurationType> 81 <PlatformToolset>v120</PlatformToolset> 77 82 </PropertyGroup> 78 83 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'"> -
trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj
r160574 r160655 59 59 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 60 60 <ConfigurationType>StaticLibrary</ConfigurationType> 61 <PlatformToolset>v120</PlatformToolset> 61 62 </PropertyGroup> 62 63 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 63 64 <ConfigurationType>StaticLibrary</ConfigurationType> 65 <PlatformToolset>v120</PlatformToolset> 64 66 </PropertyGroup> 65 67 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'"> 66 68 <ConfigurationType>StaticLibrary</ConfigurationType> 69 <PlatformToolset>v120_xp</PlatformToolset> 67 70 </PropertyGroup> 68 71 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'"> … … 72 75 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'"> 73 76 <ConfigurationType>StaticLibrary</ConfigurationType> 77 <PlatformToolset>v120_xp</PlatformToolset> 74 78 </PropertyGroup> 75 79 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|x64'"> 76 80 <ConfigurationType>StaticLibrary</ConfigurationType> 81 <PlatformToolset>v120</PlatformToolset> 77 82 </PropertyGroup> 78 83 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'"> -
trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj
r160574 r160655 59 59 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 60 60 <ConfigurationType>StaticLibrary</ConfigurationType> 61 <PlatformToolset>v120</PlatformToolset> 61 62 </PropertyGroup> 62 63 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 63 64 <ConfigurationType>StaticLibrary</ConfigurationType> 65 <PlatformToolset>v120</PlatformToolset> 64 66 </PropertyGroup> 65 67 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'"> 66 68 <ConfigurationType>StaticLibrary</ConfigurationType> 69 <PlatformToolset>v120_xp</PlatformToolset> 67 70 </PropertyGroup> 68 71 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'"> … … 72 75 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'"> 73 76 <ConfigurationType>StaticLibrary</ConfigurationType> 77 <PlatformToolset>v120_xp</PlatformToolset> 74 78 </PropertyGroup> 75 79 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|x64'"> 76 80 <ConfigurationType>StaticLibrary</ConfigurationType> 81 <PlatformToolset>v120</PlatformToolset> 77 82 </PropertyGroup> 78 83 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'"> -
trunk/Source/ThirdParty/ANGLE/ChangeLog
r160574 r160655 1 2013-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 1 15 2013-12-13 Brent Fulgham <bfulgham@apple.com> 2 16 -
trunk/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj
r160548 r160655 65 65 <ConfigurationType>StaticLibrary</ConfigurationType> 66 66 <CharacterSet>MultiByte</CharacterSet> 67 <PlatformToolset>v120</PlatformToolset> 67 68 </PropertyGroup> 68 69 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration"> … … 74 75 <ConfigurationType>StaticLibrary</ConfigurationType> 75 76 <CharacterSet>MultiByte</CharacterSet> 77 <PlatformToolset>v120_xp</PlatformToolset> 76 78 </PropertyGroup> 77 79 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration"> … … 83 85 <ConfigurationType>StaticLibrary</ConfigurationType> 84 86 <CharacterSet>MultiByte</CharacterSet> 87 <PlatformToolset>v120</PlatformToolset> 85 88 </PropertyGroup> 86 89 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> … … 92 95 <ConfigurationType>StaticLibrary</ConfigurationType> 93 96 <CharacterSet>MultiByte</CharacterSet> 97 <PlatformToolset>v120</PlatformToolset> 94 98 </PropertyGroup> 95 99 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration"> … … 101 105 <ConfigurationType>StaticLibrary</ConfigurationType> 102 106 <CharacterSet>MultiByte</CharacterSet> 107 <PlatformToolset>v120_xp</PlatformToolset> 103 108 </PropertyGroup> 104 109 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration"> … … 110 115 <ConfigurationType>StaticLibrary</ConfigurationType> 111 116 <CharacterSet>MultiByte</CharacterSet> 117 <PlatformToolset>v120</PlatformToolset> 112 118 </PropertyGroup> 113 119 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -
trunk/Source/WTF/ChangeLog
r160648 r160655 1 2013-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 1 11 2013-12-16 Peter Szanka <h868064@stud.u-szeged.hu> 2 12 -
trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj
r160548 r160655 336 336 <UseDebugLibraries>true</UseDebugLibraries> 337 337 <CharacterSet>Unicode</CharacterSet> 338 <PlatformToolset>v120</PlatformToolset> 338 339 </PropertyGroup> 339 340 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration"> … … 347 348 <UseDebugLibraries>true</UseDebugLibraries> 348 349 <CharacterSet>Unicode</CharacterSet> 350 <PlatformToolset>v120_xp</PlatformToolset> 349 351 </PropertyGroup> 350 352 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration"> … … 358 360 <UseDebugLibraries>true</UseDebugLibraries> 359 361 <CharacterSet>Unicode</CharacterSet> 362 <PlatformToolset>v120</PlatformToolset> 360 363 </PropertyGroup> 361 364 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> … … 369 372 <UseDebugLibraries>false</UseDebugLibraries> 370 373 <CharacterSet>Unicode</CharacterSet> 374 <PlatformToolset>v120</PlatformToolset> 371 375 </PropertyGroup> 372 376 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration"> … … 380 384 <UseDebugLibraries>false</UseDebugLibraries> 381 385 <CharacterSet>Unicode</CharacterSet> 386 <PlatformToolset>v120_xp</PlatformToolset> 382 387 </PropertyGroup> 383 388 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration"> … … 391 396 <UseDebugLibraries>false</UseDebugLibraries> 392 397 <CharacterSet>Unicode</CharacterSet> 398 <PlatformToolset>v120</PlatformToolset> 393 399 </PropertyGroup> 394 400 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -
trunk/Source/WTF/WTF.vcxproj/WTFGenerated.vcxproj
r160563 r160655 70 70 <ConfigurationType>Makefile</ConfigurationType> 71 71 <UseDebugLibraries>true</UseDebugLibraries> 72 <PlatformToolset>v120 _xp</PlatformToolset>72 <PlatformToolset>v120</PlatformToolset> 73 73 </PropertyGroup> 74 74 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration"> … … 90 90 <ConfigurationType>Makefile</ConfigurationType> 91 91 <UseDebugLibraries>true</UseDebugLibraries> 92 <PlatformToolset>v120 _xp</PlatformToolset>92 <PlatformToolset>v120</PlatformToolset> 93 93 </PropertyGroup> 94 94 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> … … 100 100 <ConfigurationType>Makefile</ConfigurationType> 101 101 <UseDebugLibraries>false</UseDebugLibraries> 102 <PlatformToolset>v120 _xp</PlatformToolset>102 <PlatformToolset>v120</PlatformToolset> 103 103 </PropertyGroup> 104 104 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration"> … … 120 120 <ConfigurationType>Makefile</ConfigurationType> 121 121 <UseDebugLibraries>false</UseDebugLibraries> 122 <PlatformToolset>v120 _xp</PlatformToolset>122 <PlatformToolset>v120</PlatformToolset> 123 123 </PropertyGroup> 124 124 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -
trunk/Source/WebCore/ChangeLog
r160652 r160655 1 2013-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 1 12 2013-12-16 Simon Fraser <simon.fraser@apple.com> 2 13 -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
r160577 r160655 65 65 <ConfigurationType>StaticLibrary</ConfigurationType> 66 66 <CharacterSet>Unicode</CharacterSet> 67 <PlatformToolset>v120</PlatformToolset> 67 68 </PropertyGroup> 68 69 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration"> … … 74 75 <ConfigurationType>StaticLibrary</ConfigurationType> 75 76 <CharacterSet>Unicode</CharacterSet> 77 <PlatformToolset>v120_xp</PlatformToolset> 76 78 </PropertyGroup> 77 79 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration"> … … 83 85 <ConfigurationType>StaticLibrary</ConfigurationType> 84 86 <CharacterSet>Unicode</CharacterSet> 87 <PlatformToolset>v120</PlatformToolset> 85 88 </PropertyGroup> 86 89 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> … … 92 95 <ConfigurationType>StaticLibrary</ConfigurationType> 93 96 <CharacterSet>Unicode</CharacterSet> 97 <PlatformToolset>v120</PlatformToolset> 94 98 </PropertyGroup> 95 99 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration"> … … 101 105 <ConfigurationType>StaticLibrary</ConfigurationType> 102 106 <CharacterSet>Unicode</CharacterSet> 107 <PlatformToolset>v120_xp</PlatformToolset> 103 108 </PropertyGroup> 104 109 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration"> … … 110 115 <ConfigurationType>StaticLibrary</ConfigurationType> 111 116 <CharacterSet>Unicode</CharacterSet> 117 <PlatformToolset>v120</PlatformToolset> 112 118 </PropertyGroup> 113 119 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -
trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.vcxproj
r160563 r160655 74 74 <ConfigurationType>Makefile</ConfigurationType> 75 75 <UseDebugLibraries>true</UseDebugLibraries> 76 <PlatformToolset>v120 _xp</PlatformToolset>76 <PlatformToolset>v120</PlatformToolset> 77 77 <OutDir>$(SolutionDir)$(Configuration)\</OutDir> 78 78 </PropertyGroup> … … 98 98 <ConfigurationType>Makefile</ConfigurationType> 99 99 <UseDebugLibraries>true</UseDebugLibraries> 100 <PlatformToolset>v120 _xp</PlatformToolset>100 <PlatformToolset>v120</PlatformToolset> 101 101 <OutDir>$(SolutionDir)$(Configuration)\</OutDir> 102 102 </PropertyGroup> … … 109 109 <ConfigurationType>Makefile</ConfigurationType> 110 110 <UseDebugLibraries>false</UseDebugLibraries> 111 <PlatformToolset>v120 _xp</PlatformToolset>111 <PlatformToolset>v120</PlatformToolset> 112 112 </PropertyGroup> 113 113 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration"> … … 129 129 <ConfigurationType>Makefile</ConfigurationType> 130 130 <UseDebugLibraries>false</UseDebugLibraries> 131 <PlatformToolset>v120 _xp</PlatformToolset>131 <PlatformToolset>v120</PlatformToolset> 132 132 </PropertyGroup> 133 133 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -
trunk/Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj
r160548 r160655 65 65 <ConfigurationType>StaticLibrary</ConfigurationType> 66 66 <CharacterSet>Unicode</CharacterSet> 67 <PlatformToolset>v120</PlatformToolset> 67 68 </PropertyGroup> 68 69 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration"> … … 74 75 <ConfigurationType>StaticLibrary</ConfigurationType> 75 76 <CharacterSet>Unicode</CharacterSet> 77 <PlatformToolset>v120_xp</PlatformToolset> 76 78 </PropertyGroup> 77 79 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration"> … … 83 85 <ConfigurationType>StaticLibrary</ConfigurationType> 84 86 <CharacterSet>Unicode</CharacterSet> 87 <PlatformToolset>v120</PlatformToolset> 85 88 </PropertyGroup> 86 89 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> … … 92 95 <ConfigurationType>StaticLibrary</ConfigurationType> 93 96 <CharacterSet>Unicode</CharacterSet> 97 <PlatformToolset>v120</PlatformToolset> 94 98 </PropertyGroup> 95 99 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration"> … … 101 105 <ConfigurationType>StaticLibrary</ConfigurationType> 102 106 <CharacterSet>Unicode</CharacterSet> 107 <PlatformToolset>v120_xp</PlatformToolset> 103 108 </PropertyGroup> 104 109 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration"> … … 110 115 <ConfigurationType>StaticLibrary</ConfigurationType> 111 116 <CharacterSet>Unicode</CharacterSet> 117 <PlatformToolset>v120</PlatformToolset> 112 118 </PropertyGroup> 113 119 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -
trunk/Source/WebInspectorUI/ChangeLog
r160588 r160655 1 2013-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 1 11 2013-12-13 Joseph Pecoraro <pecoraro@apple.com> 2 12 -
trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj
r160557 r160655 22 22 <Platform>Win32</Platform> 23 23 </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> 24 44 </ItemGroup> 25 45 <PropertyGroup Label="Globals"> … … 61 81 <PlatformToolset>v120_xp</PlatformToolset> 62 82 </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> 63 116 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 64 117 <ImportGroup Label="ExtensionSettings"> … … 85 138 </ImportGroup> 86 139 <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"> 87 165 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 88 166 <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" /> -
trunk/Source/WebKit/ChangeLog
r160624 r160655 1 2013-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 1 16 2013-12-15 Brent Fulgham <bfulgham@webkit.org> 2 17 -
trunk/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj
r160548 r160655 66 66 <ConfigurationType>StaticLibrary</ConfigurationType> 67 67 <CharacterSet>Unicode</CharacterSet> 68 <PlatformToolset>v120</PlatformToolset> 68 69 </PropertyGroup> 69 70 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration"> … … 77 78 <ConfigurationType>StaticLibrary</ConfigurationType> 78 79 <CharacterSet>Unicode</CharacterSet> 80 <PlatformToolset>v120_xp</PlatformToolset> 79 81 </PropertyGroup> 80 82 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration"> … … 88 90 <ConfigurationType>StaticLibrary</ConfigurationType> 89 91 <CharacterSet>Unicode</CharacterSet> 92 <PlatformToolset>v120</PlatformToolset> 90 93 </PropertyGroup> 91 94 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> … … 99 102 <UseDebugLibraries>false</UseDebugLibraries> 100 103 <CharacterSet>Unicode</CharacterSet> 104 <PlatformToolset>v120</PlatformToolset> 101 105 </PropertyGroup> 102 106 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration"> … … 110 114 <UseDebugLibraries>false</UseDebugLibraries> 111 115 <CharacterSet>Unicode</CharacterSet> 116 <PlatformToolset>v120_xp</PlatformToolset> 112 117 </PropertyGroup> 113 118 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration"> … … 121 126 <UseDebugLibraries>false</UseDebugLibraries> 122 127 <CharacterSet>Unicode</CharacterSet> 128 <PlatformToolset>v120_xp</PlatformToolset> 123 129 </PropertyGroup> 124 130 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -
trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln
r160624 r160655 986 986 {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32 987 987 {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32 988 {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug_WinCairo|x64.ActiveCfg = Debug| Win32988 {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug_WinCairo|x64.ActiveCfg = Debug|x64 989 989 {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug|Win32.ActiveCfg = Debug|Win32 990 990 {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug|Win32.Build.0 = Debug|Win32 991 {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug|x64.ActiveCfg = Debug| Win32991 {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug|x64.ActiveCfg = Debug|x64 992 992 {0473724F-0AB3-4F12-892E-9FAB0186C804}.DebugSuffix|Win32.ActiveCfg = Debug|Win32 993 993 {0473724F-0AB3-4F12-892E-9FAB0186C804}.DebugSuffix|Win32.Build.0 = Debug|Win32 994 {0473724F-0AB3-4F12-892E-9FAB0186C804}.DebugSuffix|x64.ActiveCfg = Debug| Win32994 {0473724F-0AB3-4F12-892E-9FAB0186C804}.DebugSuffix|x64.ActiveCfg = Debug|x64 995 995 {0473724F-0AB3-4F12-892E-9FAB0186C804}.Production|Win32.ActiveCfg = Production|Win32 996 996 {0473724F-0AB3-4F12-892E-9FAB0186C804}.Production|Win32.Build.0 = Production|Win32 997 {0473724F-0AB3-4F12-892E-9FAB0186C804}.Production|x64.ActiveCfg = Release| Win32997 {0473724F-0AB3-4F12-892E-9FAB0186C804}.Production|x64.ActiveCfg = Release|x64 998 998 {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32 999 999 {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32 1000 {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release_WinCairo|x64.ActiveCfg = Release| Win321000 {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release_WinCairo|x64.ActiveCfg = Release|x64 1001 1001 {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release|Win32.ActiveCfg = Release|Win32 1002 1002 {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release|Win32.Build.0 = Release|Win32 1003 {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release|x64.ActiveCfg = Release| Win321003 {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release|x64.ActiveCfg = Release|x64 1004 1004 EndGlobalSection 1005 1005 GlobalSection(SolutionProperties) = preSolution -
trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj
r160548 r160655 66 66 <ConfigurationType>DynamicLibrary</ConfigurationType> 67 67 <CharacterSet>Unicode</CharacterSet> 68 <PlatformToolset>v120</PlatformToolset> 68 69 </PropertyGroup> 69 70 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration"> … … 75 76 <ConfigurationType>DynamicLibrary</ConfigurationType> 76 77 <CharacterSet>Unicode</CharacterSet> 78 <PlatformToolset>v120_xp</PlatformToolset> 77 79 </PropertyGroup> 78 80 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration"> … … 84 86 <ConfigurationType>DynamicLibrary</ConfigurationType> 85 87 <CharacterSet>Unicode</CharacterSet> 88 <PlatformToolset>v120</PlatformToolset> 86 89 </PropertyGroup> 87 90 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> … … 93 96 <ConfigurationType>DynamicLibrary</ConfigurationType> 94 97 <CharacterSet>Unicode</CharacterSet> 98 <PlatformToolset>v120</PlatformToolset> 95 99 </PropertyGroup> 96 100 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration"> … … 102 106 <ConfigurationType>DynamicLibrary</ConfigurationType> 103 107 <CharacterSet>Unicode</CharacterSet> 108 <PlatformToolset>v120_xp</PlatformToolset> 104 109 </PropertyGroup> 105 110 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration"> … … 111 116 <ConfigurationType>DynamicLibrary</ConfigurationType> 112 117 <CharacterSet>Unicode</CharacterSet> 118 <PlatformToolset>v120</PlatformToolset> 113 119 </PropertyGroup> 114 120 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -
trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj
r160548 r160655 68 68 <UseDebugLibraries>true</UseDebugLibraries> 69 69 <CharacterSet>Unicode</CharacterSet> 70 <PlatformToolset>v120</PlatformToolset> 70 71 </PropertyGroup> 71 72 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration"> … … 79 80 <UseDebugLibraries>true</UseDebugLibraries> 80 81 <CharacterSet>Unicode</CharacterSet> 82 <PlatformToolset>v120_xp</PlatformToolset> 81 83 </PropertyGroup> 82 84 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration"> … … 90 92 <UseDebugLibraries>true</UseDebugLibraries> 91 93 <CharacterSet>Unicode</CharacterSet> 94 <PlatformToolset>v120</PlatformToolset> 92 95 </PropertyGroup> 93 96 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> … … 101 104 <UseDebugLibraries>false</UseDebugLibraries> 102 105 <CharacterSet>Unicode</CharacterSet> 106 <PlatformToolset>v120</PlatformToolset> 103 107 </PropertyGroup> 104 108 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration"> … … 112 116 <UseDebugLibraries>false</UseDebugLibraries> 113 117 <CharacterSet>Unicode</CharacterSet> 118 <PlatformToolset>v120_xp</PlatformToolset> 114 119 </PropertyGroup> 115 120 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration"> … … 123 128 <UseDebugLibraries>false</UseDebugLibraries> 124 129 <CharacterSet>Unicode</CharacterSet> 130 <PlatformToolset>v120</PlatformToolset> 125 131 </PropertyGroup> 126 132 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -
trunk/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj
r160548 r160655 66 66 <UseDebugLibraries>true</UseDebugLibraries> 67 67 <CharacterSet>Unicode</CharacterSet> 68 <PlatformToolset>v120</PlatformToolset> 68 69 </PropertyGroup> 69 70 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration"> … … 77 78 <UseDebugLibraries>true</UseDebugLibraries> 78 79 <CharacterSet>Unicode</CharacterSet> 80 <PlatformToolset>v120</PlatformToolset> 79 81 </PropertyGroup> 80 82 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> … … 88 90 <UseDebugLibraries>false</UseDebugLibraries> 89 91 <CharacterSet>Unicode</CharacterSet> 92 <PlatformToolset>v120</PlatformToolset> 90 93 </PropertyGroup> 91 94 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration"> … … 99 102 <UseDebugLibraries>false</UseDebugLibraries> 100 103 <CharacterSet>Unicode</CharacterSet> 104 <PlatformToolset>v120_xp</PlatformToolset> 101 105 </PropertyGroup> 102 106 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration"> … … 110 114 <UseDebugLibraries>false</UseDebugLibraries> 111 115 <CharacterSet>Unicode</CharacterSet> 116 <PlatformToolset>v120</PlatformToolset> 112 117 </PropertyGroup> 113 118 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'"> … … 123 128 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration"> 124 129 <CharacterSet>Unicode</CharacterSet> 130 <PlatformToolset>v120_xp</PlatformToolset> 125 131 </PropertyGroup> 126 132 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -
trunk/Tools/ChangeLog
r160654 r160655 1 2013-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 1 19 2013-12-16 Simon Fraser <simon.fraser@apple.com> 2 20 -
trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj
r160548 r160655 65 65 <ConfigurationType>DynamicLibrary</ConfigurationType> 66 66 <CharacterSet>Unicode</CharacterSet> 67 <PlatformToolset>v120</PlatformToolset> 67 68 </PropertyGroup> 68 69 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration"> … … 74 75 <ConfigurationType>DynamicLibrary</ConfigurationType> 75 76 <CharacterSet>Unicode</CharacterSet> 77 <PlatformToolset>v120_xp</PlatformToolset> 76 78 </PropertyGroup> 77 79 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration"> … … 83 85 <ConfigurationType>DynamicLibrary</ConfigurationType> 84 86 <CharacterSet>Unicode</CharacterSet> 87 <PlatformToolset>v120</PlatformToolset> 85 88 </PropertyGroup> 86 89 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> … … 92 95 <ConfigurationType>DynamicLibrary</ConfigurationType> 93 96 <CharacterSet>Unicode</CharacterSet> 97 <PlatformToolset>v120</PlatformToolset> 94 98 </PropertyGroup> 95 99 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration"> … … 101 105 <ConfigurationType>DynamicLibrary</ConfigurationType> 102 106 <CharacterSet>Unicode</CharacterSet> 107 <PlatformToolset>v120_xp</PlatformToolset> 103 108 </PropertyGroup> 104 109 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration"> … … 110 115 <ConfigurationType>DynamicLibrary</ConfigurationType> 111 116 <CharacterSet>Unicode</CharacterSet> 117 <PlatformToolset>v120</PlatformToolset> 112 118 </PropertyGroup> 113 119 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -
trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj
r160548 r160655 65 65 <ConfigurationType>Application</ConfigurationType> 66 66 <CharacterSet>Unicode</CharacterSet> 67 <PlatformToolset>v120</PlatformToolset> 67 68 </PropertyGroup> 68 69 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration"> … … 74 75 <ConfigurationType>Application</ConfigurationType> 75 76 <CharacterSet>Unicode</CharacterSet> 77 <PlatformToolset>v120_xp</PlatformToolset> 76 78 </PropertyGroup> 77 79 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration"> … … 83 85 <ConfigurationType>Application</ConfigurationType> 84 86 <CharacterSet>Unicode</CharacterSet> 87 <PlatformToolset>v120</PlatformToolset> 85 88 </PropertyGroup> 86 89 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> … … 92 95 <ConfigurationType>Application</ConfigurationType> 93 96 <CharacterSet>Unicode</CharacterSet> 97 <PlatformToolset>v120</PlatformToolset> 94 98 </PropertyGroup> 95 99 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration"> … … 101 105 <ConfigurationType>Application</ConfigurationType> 102 106 <CharacterSet>Unicode</CharacterSet> 107 <PlatformToolset>v120_xp</PlatformToolset> 103 108 </PropertyGroup> 104 109 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration"> … … 110 115 <ConfigurationType>Application</ConfigurationType> 111 116 <CharacterSet>Unicode</CharacterSet> 117 <PlatformToolset>v120</PlatformToolset> 112 118 </PropertyGroup> 113 119 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -
trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiff.vcxproj
r160548 r160655 64 64 <ConfigurationType>DynamicLibrary</ConfigurationType> 65 65 <CharacterSet>Unicode</CharacterSet> 66 <PlatformToolset>v120</PlatformToolset> 66 67 </PropertyGroup> 67 68 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration"> … … 73 74 <ConfigurationType>DynamicLibrary</ConfigurationType> 74 75 <CharacterSet>Unicode</CharacterSet> 76 <PlatformToolset>v120_xp</PlatformToolset> 75 77 </PropertyGroup> 76 78 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration"> … … 82 84 <ConfigurationType>DynamicLibrary</ConfigurationType> 83 85 <CharacterSet>Unicode</CharacterSet> 86 <PlatformToolset>v120</PlatformToolset> 84 87 </PropertyGroup> 85 88 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> … … 91 94 <ConfigurationType>DynamicLibrary</ConfigurationType> 92 95 <CharacterSet>Unicode</CharacterSet> 96 <PlatformToolset>v120</PlatformToolset> 93 97 </PropertyGroup> 94 98 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration"> … … 100 104 <ConfigurationType>DynamicLibrary</ConfigurationType> 101 105 <CharacterSet>Unicode</CharacterSet> 106 <PlatformToolset>v120_xp</PlatformToolset> 102 107 </PropertyGroup> 103 108 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration"> … … 109 114 <ConfigurationType>DynamicLibrary</ConfigurationType> 110 115 <CharacterSet>Unicode</CharacterSet> 116 <PlatformToolset>v120</PlatformToolset> 111 117 </PropertyGroup> 112 118 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -
trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncher.vcxproj
r160548 r160655 65 65 <ConfigurationType>Application</ConfigurationType> 66 66 <CharacterSet>Unicode</CharacterSet> 67 <PlatformToolset>v120</PlatformToolset> 67 68 </PropertyGroup> 68 69 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration"> … … 74 75 <ConfigurationType>Application</ConfigurationType> 75 76 <CharacterSet>Unicode</CharacterSet> 77 <PlatformToolset>v120_xp</PlatformToolset> 76 78 </PropertyGroup> 77 79 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration"> … … 83 85 <ConfigurationType>Application</ConfigurationType> 84 86 <CharacterSet>Unicode</CharacterSet> 87 <PlatformToolset>v120</PlatformToolset> 85 88 </PropertyGroup> 86 89 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> … … 92 95 <ConfigurationType>Application</ConfigurationType> 93 96 <CharacterSet>Unicode</CharacterSet> 97 <PlatformToolset>v120</PlatformToolset> 94 98 </PropertyGroup> 95 99 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration"> … … 101 105 <ConfigurationType>Application</ConfigurationType> 102 106 <CharacterSet>Unicode</CharacterSet> 107 <PlatformToolset>v120_xp</PlatformToolset> 103 108 </PropertyGroup> 104 109 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration"> … … 110 115 <ConfigurationType>Application</ConfigurationType> 111 116 <CharacterSet>Unicode</CharacterSet> 117 <PlatformToolset>v120</PlatformToolset> 112 118 </PropertyGroup> 113 119 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -
trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.vcxproj
r160548 r160655 117 117 <ConfigurationType>DynamicLibrary</ConfigurationType> 118 118 <CharacterSet>Unicode</CharacterSet> 119 <PlatformToolset>v120</PlatformToolset> 119 120 </PropertyGroup> 120 121 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration"> … … 126 127 <ConfigurationType>DynamicLibrary</ConfigurationType> 127 128 <CharacterSet>Unicode</CharacterSet> 129 <PlatformToolset>v120_xp</PlatformToolset> 128 130 </PropertyGroup> 129 131 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration"> … … 135 137 <ConfigurationType>DynamicLibrary</ConfigurationType> 136 138 <CharacterSet>Unicode</CharacterSet> 139 <PlatformToolset>v120</PlatformToolset> 137 140 </PropertyGroup> 138 141 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> … … 144 147 <ConfigurationType>DynamicLibrary</ConfigurationType> 145 148 <CharacterSet>Unicode</CharacterSet> 149 <PlatformToolset>v120</PlatformToolset> 146 150 </PropertyGroup> 147 151 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration"> … … 153 157 <ConfigurationType>DynamicLibrary</ConfigurationType> 154 158 <CharacterSet>Unicode</CharacterSet> 159 <PlatformToolset>v120_xp</PlatformToolset> 155 160 </PropertyGroup> 156 161 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration"> … … 162 167 <ConfigurationType>DynamicLibrary</ConfigurationType> 163 168 <CharacterSet>Unicode</CharacterSet> 169 <PlatformToolset>v120</PlatformToolset> 164 170 </PropertyGroup> 165 171 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -
trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj
r160548 r160655 67 67 <UseDebugLibraries>true</UseDebugLibraries> 68 68 <CharacterSet>Unicode</CharacterSet> 69 <PlatformToolset>v120</PlatformToolset> 69 70 </PropertyGroup> 70 71 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration"> … … 78 79 <UseDebugLibraries>true</UseDebugLibraries> 79 80 <CharacterSet>Unicode</CharacterSet> 81 <PlatformToolset>v120_xp</PlatformToolset> 80 82 </PropertyGroup> 81 83 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration"> … … 89 91 <UseDebugLibraries>true</UseDebugLibraries> 90 92 <CharacterSet>Unicode</CharacterSet> 93 <PlatformToolset>v120</PlatformToolset> 91 94 </PropertyGroup> 92 95 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> … … 100 103 <UseDebugLibraries>false</UseDebugLibraries> 101 104 <CharacterSet>Unicode</CharacterSet> 105 <PlatformToolset>v120</PlatformToolset> 102 106 </PropertyGroup> 103 107 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration"> … … 111 115 <UseDebugLibraries>false</UseDebugLibraries> 112 116 <CharacterSet>Unicode</CharacterSet> 117 <PlatformToolset>v120_xp</PlatformToolset> 113 118 </PropertyGroup> 114 119 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration"> … … 122 127 <UseDebugLibraries>false</UseDebugLibraries> 123 128 <CharacterSet>Unicode</CharacterSet> 129 <PlatformToolset>v120</PlatformToolset> 124 130 </PropertyGroup> 125 131 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -
trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj
r160548 r160655 65 65 <ConfigurationType>Application</ConfigurationType> 66 66 <CharacterSet>Unicode</CharacterSet> 67 <PlatformToolset>v120</PlatformToolset> 67 68 </PropertyGroup> 68 69 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration"> … … 74 75 <ConfigurationType>Application</ConfigurationType> 75 76 <CharacterSet>Unicode</CharacterSet> 77 <PlatformToolset>v120_xp</PlatformToolset> 76 78 </PropertyGroup> 77 79 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration"> … … 83 85 <ConfigurationType>Application</ConfigurationType> 84 86 <CharacterSet>Unicode</CharacterSet> 87 <PlatformToolset>v120</PlatformToolset> 85 88 </PropertyGroup> 86 89 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> … … 92 95 <ConfigurationType>Application</ConfigurationType> 93 96 <CharacterSet>Unicode</CharacterSet> 97 <PlatformToolset>v120</PlatformToolset> 94 98 </PropertyGroup> 95 99 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration"> … … 101 105 <ConfigurationType>Application</ConfigurationType> 102 106 <CharacterSet>Unicode</CharacterSet> 107 <PlatformToolset>v120_xp</PlatformToolset> 103 108 </PropertyGroup> 104 109 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration"> … … 110 115 <ConfigurationType>Application</ConfigurationType> 111 116 <CharacterSet>Unicode</CharacterSet> 117 <PlatformToolset>v120</PlatformToolset> 112 118 </PropertyGroup> 113 119 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -
trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj
r160548 r160655 65 65 <ConfigurationType>DynamicLibrary</ConfigurationType> 66 66 <CharacterSet>Unicode</CharacterSet> 67 <PlatformToolset>v120</PlatformToolset> 67 68 </PropertyGroup> 68 69 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration"> … … 74 75 <ConfigurationType>DynamicLibrary</ConfigurationType> 75 76 <CharacterSet>Unicode</CharacterSet> 77 <PlatformToolset>v120_xp</PlatformToolset> 76 78 </PropertyGroup> 77 79 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration"> … … 83 85 <ConfigurationType>DynamicLibrary</ConfigurationType> 84 86 <CharacterSet>Unicode</CharacterSet> 87 <PlatformToolset>v120</PlatformToolset> 85 88 </PropertyGroup> 86 89 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> … … 92 95 <ConfigurationType>DynamicLibrary</ConfigurationType> 93 96 <CharacterSet>Unicode</CharacterSet> 97 <PlatformToolset>v120</PlatformToolset> 94 98 </PropertyGroup> 95 99 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration"> … … 101 105 <ConfigurationType>DynamicLibrary</ConfigurationType> 102 106 <CharacterSet>Unicode</CharacterSet> 107 <PlatformToolset>v120_xp</PlatformToolset> 103 108 </PropertyGroup> 104 109 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration"> … … 110 115 <ConfigurationType>DynamicLibrary</ConfigurationType> 111 116 <CharacterSet>Unicode</CharacterSet> 117 <PlatformToolset>v120</PlatformToolset> 112 118 </PropertyGroup> 113 119 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -
trunk/Tools/win/AssembleBuildLogs/AssembleBuildLogs.vcxproj
r160563 r160655 56 56 <ConfigurationType>Makefile</ConfigurationType> 57 57 <UseDebugLibraries>true</UseDebugLibraries> 58 <PlatformToolset>v120 _xp</PlatformToolset>58 <PlatformToolset>v120</PlatformToolset> 59 59 </PropertyGroup> 60 60 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration"> … … 76 76 <ConfigurationType>Makefile</ConfigurationType> 77 77 <UseDebugLibraries>false</UseDebugLibraries> 78 <PlatformToolset>v120 _xp</PlatformToolset>78 <PlatformToolset>v120</PlatformToolset> 79 79 </PropertyGroup> 80 80 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration"> … … 96 96 <ConfigurationType>Makefile</ConfigurationType> 97 97 <UseDebugLibraries>false</UseDebugLibraries> 98 <PlatformToolset>v120 _xp</PlatformToolset>98 <PlatformToolset>v120</PlatformToolset> 99 99 </PropertyGroup> 100 100 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -
trunk/Tools/win/record-memory/record-memory.vcxproj
r160548 r160655 67 67 <UseDebugLibraries>true</UseDebugLibraries> 68 68 <CharacterSet>Unicode</CharacterSet> 69 <PlatformToolset>v120</PlatformToolset> 69 70 </PropertyGroup> 70 71 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration"> … … 78 79 <UseDebugLibraries>true</UseDebugLibraries> 79 80 <CharacterSet>Unicode</CharacterSet> 81 <PlatformToolset>v120_xp</PlatformToolset> 80 82 </PropertyGroup> 81 83 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration"> … … 89 91 <UseDebugLibraries>true</UseDebugLibraries> 90 92 <CharacterSet>Unicode</CharacterSet> 93 <PlatformToolset>v120</PlatformToolset> 91 94 </PropertyGroup> 92 95 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> … … 100 103 <UseDebugLibraries>false</UseDebugLibraries> 101 104 <CharacterSet>Unicode</CharacterSet> 105 <PlatformToolset>v120</PlatformToolset> 102 106 </PropertyGroup> 103 107 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration"> … … 111 115 <UseDebugLibraries>false</UseDebugLibraries> 112 116 <CharacterSet>Unicode</CharacterSet> 117 <PlatformToolset>v120_xp</PlatformToolset> 113 118 </PropertyGroup> 114 119 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration"> … … 122 127 <UseDebugLibraries>false</UseDebugLibraries> 123 128 <CharacterSet>Unicode</CharacterSet> 129 <PlatformToolset>v120</PlatformToolset> 124 130 </PropertyGroup> 125 131 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
Note: See TracChangeset
for help on using the changeset viewer.