Skip to content

Commit feec148

Browse files
brentfulghambrentfulgham
committed
[Win] Switch Windows build to Visual Studio 2015
https://bugs.webkit.org/show_bug.cgi?id=147887 <rdar://problem/22235098> Reviewed by Alex Christensen. Update Visual Studio project file settings to use the current Visual Studio and compiler. Continue targeting binaries to run on our minimum supported configuration of Windows 7. Source/JavaScriptCore: * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj: * JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj: * JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj: * JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj: * JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractor.vcxproj: * JavaScriptCore.vcxproj/jsc/jsc.vcxproj: * JavaScriptCore.vcxproj/jsc/jscLauncher.vcxproj: * JavaScriptCore.vcxproj/libllvmForJSC/libllvmForJSC.vcxproj: * JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj: * JavaScriptCore.vcxproj/testRegExp/testRegExpLauncher.vcxproj: * JavaScriptCore.vcxproj/testapi/testapi.vcxproj: * JavaScriptCore.vcxproj/testapi/testapiLauncher.vcxproj: Source/ThirdParty: * gtest/msvc/gtest-md.vcxproj: Source/ThirdParty/ANGLE: * ANGLE.vcxproj/libEGL.vcxproj: * ANGLE.vcxproj/libGLESv2.vcxproj: * ANGLE.vcxproj/preprocessor.vcxproj: * ANGLE.vcxproj/translator_common.vcxproj: * ANGLE.vcxproj/translator_glsl.vcxproj: * ANGLE.vcxproj/translator_hlsl.vcxproj: Source/WebCore: No change in behavior, so no new tests. * WebCore.vcxproj/WebCore.vcxproj: * WebCore.vcxproj/WebCoreGenerated.vcxproj: * WebCore.vcxproj/WebCoreTestSupport.vcxproj: Source/WebInspectorUI: * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj: Source/WebKit: * WebKit.vcxproj/Interfaces/Interfaces.vcxproj: * WebKit.vcxproj/WebKit.sln: * WebKit.vcxproj/WebKit/WebKit.vcxproj: * WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj: Source/WTF: * WTF.vcxproj/WTF.vcxproj: * WTF.vcxproj/WTFGenerated.vcxproj: 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: * Scripts/webkitdirs.pm: Modify our Visual Studio search routines to prefer the newer MSBuild included in Visual Studio 2015. (visualStudioInstallDir): (msBuildInstallDir): (visualStudioVersion): * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj: * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj.filters: * WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj: * WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj: * win/AssembleBuildLogs/AssembleBuildLogs.vcxproj: * win/record-memory/record-memory.vcxproj: Canonical link: https://commits.webkit.org/166003@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@188291 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 1b4b96d commit feec148

49 files changed

Lines changed: 989 additions & 714 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Source/JavaScriptCore/ChangeLog‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,28 @@
1+
2015-08-11 Brent Fulgham <[email protected]>
2+
3+
[Win] Switch Windows build to Visual Studio 2015
4+
https://bugs.webkit.org/show_bug.cgi?id=147887
5+
<rdar://problem/22235098>
6+
7+
Reviewed by Alex Christensen.
8+
9+
Update Visual Studio project file settings to use the current Visual
10+
Studio and compiler. Continue targeting binaries to run on our minimum
11+
supported configuration of Windows 7.
12+
13+
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
14+
* JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj:
15+
* JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj:
16+
* JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj:
17+
* JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractor.vcxproj:
18+
* JavaScriptCore.vcxproj/jsc/jsc.vcxproj:
19+
* JavaScriptCore.vcxproj/jsc/jscLauncher.vcxproj:
20+
* JavaScriptCore.vcxproj/libllvmForJSC/libllvmForJSC.vcxproj:
21+
* JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj:
22+
* JavaScriptCore.vcxproj/testRegExp/testRegExpLauncher.vcxproj:
23+
* JavaScriptCore.vcxproj/testapi/testapi.vcxproj:
24+
* JavaScriptCore.vcxproj/testapi/testapiLauncher.vcxproj:
25+
126
2015-08-10 Filip Pizlo <[email protected]>
227

328
WTF should have a ParkingLot for parking sleeping threads, so that locks can fit in 1.6 bits

‎Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="DebugSuffix|Win32">
55
<Configuration>DebugSuffix</Configuration>
@@ -55,79 +55,80 @@
5555
<Keyword>Win32Proj</Keyword>
5656
<RootNamespace>JavaScriptCore2</RootNamespace>
5757
<ProjectName>JavaScriptCore</ProjectName>
58+
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
5859
</PropertyGroup>
5960
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
6061
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
6162
<UseDebugLibraries>true</UseDebugLibraries>
6263
<CharacterSet>Unicode</CharacterSet>
6364
<ConfigurationType>DynamicLibrary</ConfigurationType>
64-
<PlatformToolset>v120</PlatformToolset>
65+
<PlatformToolset>v140</PlatformToolset>
6566
</PropertyGroup>
6667
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
6768
<UseDebugLibraries>true</UseDebugLibraries>
6869
<CharacterSet>Unicode</CharacterSet>
6970
<ConfigurationType>DynamicLibrary</ConfigurationType>
70-
<PlatformToolset>v120</PlatformToolset>
71+
<PlatformToolset>v140</PlatformToolset>
7172
</PropertyGroup>
7273
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
7374
<UseDebugLibraries>true</UseDebugLibraries>
7475
<CharacterSet>Unicode</CharacterSet>
7576
<ConfigurationType>DynamicLibrary</ConfigurationType>
76-
<PlatformToolset>v120_xp</PlatformToolset>
77+
<PlatformToolset>v140</PlatformToolset>
7778
</PropertyGroup>
7879
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
7980
<UseDebugLibraries>true</UseDebugLibraries>
8081
<CharacterSet>Unicode</CharacterSet>
8182
<ConfigurationType>DynamicLibrary</ConfigurationType>
82-
<PlatformToolset>v120_xp</PlatformToolset>
83+
<PlatformToolset>v140</PlatformToolset>
8384
</PropertyGroup>
8485
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
8586
<UseDebugLibraries>true</UseDebugLibraries>
8687
<CharacterSet>Unicode</CharacterSet>
8788
<ConfigurationType>DynamicLibrary</ConfigurationType>
88-
<PlatformToolset>v120</PlatformToolset>
89+
<PlatformToolset>v140</PlatformToolset>
8990
</PropertyGroup>
9091
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
9192
<UseDebugLibraries>true</UseDebugLibraries>
9293
<CharacterSet>Unicode</CharacterSet>
9394
<ConfigurationType>DynamicLibrary</ConfigurationType>
94-
<PlatformToolset>v120</PlatformToolset>
95+
<PlatformToolset>v140</PlatformToolset>
9596
</PropertyGroup>
9697
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
9798
<ConfigurationType>DynamicLibrary</ConfigurationType>
9899
<UseDebugLibraries>false</UseDebugLibraries>
99100
<CharacterSet>Unicode</CharacterSet>
100-
<PlatformToolset>v120</PlatformToolset>
101+
<PlatformToolset>v140</PlatformToolset>
101102
</PropertyGroup>
102103
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
103104
<ConfigurationType>DynamicLibrary</ConfigurationType>
104105
<UseDebugLibraries>false</UseDebugLibraries>
105106
<CharacterSet>Unicode</CharacterSet>
106-
<PlatformToolset>v120</PlatformToolset>
107+
<PlatformToolset>v140</PlatformToolset>
107108
</PropertyGroup>
108109
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
109110
<ConfigurationType>DynamicLibrary</ConfigurationType>
110111
<UseDebugLibraries>false</UseDebugLibraries>
111112
<CharacterSet>Unicode</CharacterSet>
112-
<PlatformToolset>v120_xp</PlatformToolset>
113+
<PlatformToolset>v140</PlatformToolset>
113114
</PropertyGroup>
114115
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
115116
<ConfigurationType>DynamicLibrary</ConfigurationType>
116117
<UseDebugLibraries>false</UseDebugLibraries>
117118
<CharacterSet>Unicode</CharacterSet>
118-
<PlatformToolset>v120_xp</PlatformToolset>
119+
<PlatformToolset>v140</PlatformToolset>
119120
</PropertyGroup>
120121
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
121122
<ConfigurationType>DynamicLibrary</ConfigurationType>
122123
<UseDebugLibraries>false</UseDebugLibraries>
123124
<CharacterSet>Unicode</CharacterSet>
124-
<PlatformToolset>v120</PlatformToolset>
125+
<PlatformToolset>v140</PlatformToolset>
125126
</PropertyGroup>
126127
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
127128
<ConfigurationType>DynamicLibrary</ConfigurationType>
128129
<UseDebugLibraries>false</UseDebugLibraries>
129130
<CharacterSet>Unicode</CharacterSet>
130-
<PlatformToolset>v120</PlatformToolset>
131+
<PlatformToolset>v140</PlatformToolset>
131132
</PropertyGroup>
132133
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
133134
<ImportGroup Label="ExtensionSettings">

‎Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,62 +64,62 @@
6464
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
6565
<ConfigurationType>Makefile</ConfigurationType>
6666
<UseDebugLibraries>true</UseDebugLibraries>
67-
<PlatformToolset>v120</PlatformToolset>
67+
<PlatformToolset>v140</PlatformToolset>
6868
</PropertyGroup>
6969
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
7070
<ConfigurationType>Makefile</ConfigurationType>
7171
<UseDebugLibraries>true</UseDebugLibraries>
72-
<PlatformToolset>v120</PlatformToolset>
72+
<PlatformToolset>v140</PlatformToolset>
7373
</PropertyGroup>
7474
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
7575
<ConfigurationType>Makefile</ConfigurationType>
7676
<UseDebugLibraries>true</UseDebugLibraries>
77-
<PlatformToolset>v120_xp</PlatformToolset>
77+
<PlatformToolset>v140</PlatformToolset>
7878
</PropertyGroup>
7979
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
8080
<ConfigurationType>Makefile</ConfigurationType>
8181
<UseDebugLibraries>true</UseDebugLibraries>
82-
<PlatformToolset>v120_xp</PlatformToolset>
82+
<PlatformToolset>v140</PlatformToolset>
8383
</PropertyGroup>
8484
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
8585
<ConfigurationType>Makefile</ConfigurationType>
8686
<UseDebugLibraries>true</UseDebugLibraries>
87-
<PlatformToolset>v120</PlatformToolset>
87+
<PlatformToolset>v140</PlatformToolset>
8888
</PropertyGroup>
8989
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
9090
<ConfigurationType>Makefile</ConfigurationType>
9191
<UseDebugLibraries>true</UseDebugLibraries>
92-
<PlatformToolset>v120</PlatformToolset>
92+
<PlatformToolset>v140</PlatformToolset>
9393
</PropertyGroup>
9494
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
9595
<ConfigurationType>Makefile</ConfigurationType>
9696
<UseDebugLibraries>false</UseDebugLibraries>
97-
<PlatformToolset>v120</PlatformToolset>
97+
<PlatformToolset>v140</PlatformToolset>
9898
</PropertyGroup>
9999
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
100100
<ConfigurationType>Makefile</ConfigurationType>
101101
<UseDebugLibraries>false</UseDebugLibraries>
102-
<PlatformToolset>v120</PlatformToolset>
102+
<PlatformToolset>v140</PlatformToolset>
103103
</PropertyGroup>
104104
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
105105
<ConfigurationType>Makefile</ConfigurationType>
106106
<UseDebugLibraries>false</UseDebugLibraries>
107-
<PlatformToolset>v120_xp</PlatformToolset>
107+
<PlatformToolset>v140</PlatformToolset>
108108
</PropertyGroup>
109109
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
110110
<ConfigurationType>Makefile</ConfigurationType>
111111
<UseDebugLibraries>false</UseDebugLibraries>
112-
<PlatformToolset>v120_xp</PlatformToolset>
112+
<PlatformToolset>v140</PlatformToolset>
113113
</PropertyGroup>
114114
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
115115
<ConfigurationType>Makefile</ConfigurationType>
116116
<UseDebugLibraries>false</UseDebugLibraries>
117-
<PlatformToolset>v120</PlatformToolset>
117+
<PlatformToolset>v140</PlatformToolset>
118118
</PropertyGroup>
119119
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
120120
<ConfigurationType>Makefile</ConfigurationType>
121121
<UseDebugLibraries>false</UseDebugLibraries>
122-
<PlatformToolset>v120</PlatformToolset>
122+
<PlatformToolset>v140</PlatformToolset>
123123
</PropertyGroup>
124124
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
125125
<ImportGroup Label="ExtensionSettings">

‎Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,51 +58,51 @@
5858
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
5959
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
6060
<ConfigurationType>Makefile</ConfigurationType>
61-
<PlatformToolset>v120</PlatformToolset>
61+
<PlatformToolset>v140</PlatformToolset>
6262
</PropertyGroup>
6363
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
6464
<ConfigurationType>Makefile</ConfigurationType>
65-
<PlatformToolset>v120</PlatformToolset>
65+
<PlatformToolset>v140</PlatformToolset>
6666
</PropertyGroup>
6767
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
6868
<ConfigurationType>Makefile</ConfigurationType>
69-
<PlatformToolset>v120_xp</PlatformToolset>
69+
<PlatformToolset>v140</PlatformToolset>
7070
</PropertyGroup>
7171
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
7272
<ConfigurationType>Makefile</ConfigurationType>
73-
<PlatformToolset>v120_xp</PlatformToolset>
73+
<PlatformToolset>v140</PlatformToolset>
7474
</PropertyGroup>
7575
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
7676
<ConfigurationType>Makefile</ConfigurationType>
77-
<PlatformToolset>v120</PlatformToolset>
77+
<PlatformToolset>v140</PlatformToolset>
7878
</PropertyGroup>
7979
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
8080
<ConfigurationType>Makefile</ConfigurationType>
81-
<PlatformToolset>v120</PlatformToolset>
81+
<PlatformToolset>v140</PlatformToolset>
8282
</PropertyGroup>
8383
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
8484
<ConfigurationType>Makefile</ConfigurationType>
85-
<PlatformToolset>v120</PlatformToolset>
85+
<PlatformToolset>v140</PlatformToolset>
8686
</PropertyGroup>
8787
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
8888
<ConfigurationType>Makefile</ConfigurationType>
89-
<PlatformToolset>v120</PlatformToolset>
89+
<PlatformToolset>v140</PlatformToolset>
9090
</PropertyGroup>
9191
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
9292
<ConfigurationType>Makefile</ConfigurationType>
93-
<PlatformToolset>v120_xp</PlatformToolset>
93+
<PlatformToolset>v140</PlatformToolset>
9494
</PropertyGroup>
9595
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
9696
<ConfigurationType>Makefile</ConfigurationType>
97-
<PlatformToolset>v120_xp</PlatformToolset>
97+
<PlatformToolset>v140</PlatformToolset>
9898
</PropertyGroup>
9999
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
100100
<ConfigurationType>Makefile</ConfigurationType>
101-
<PlatformToolset>v120</PlatformToolset>
101+
<PlatformToolset>v140</PlatformToolset>
102102
</PropertyGroup>
103103
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
104104
<ConfigurationType>Makefile</ConfigurationType>
105-
<PlatformToolset>v120</PlatformToolset>
105+
<PlatformToolset>v140</PlatformToolset>
106106
</PropertyGroup>
107107
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
108108
<ImportGroup Label="ExtensionSettings">

‎Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,51 +58,51 @@
5858
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
5959
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
6060
<ConfigurationType>Makefile</ConfigurationType>
61-
<PlatformToolset>v120</PlatformToolset>
61+
<PlatformToolset>v140</PlatformToolset>
6262
</PropertyGroup>
6363
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
6464
<ConfigurationType>Makefile</ConfigurationType>
65-
<PlatformToolset>v120</PlatformToolset>
65+
<PlatformToolset>v140</PlatformToolset>
6666
</PropertyGroup>
6767
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
6868
<ConfigurationType>Makefile</ConfigurationType>
69-
<PlatformToolset>v120_xp</PlatformToolset>
69+
<PlatformToolset>v140</PlatformToolset>
7070
</PropertyGroup>
7171
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
7272
<ConfigurationType>Makefile</ConfigurationType>
73-
<PlatformToolset>v120_xp</PlatformToolset>
73+
<PlatformToolset>v140</PlatformToolset>
7474
</PropertyGroup>
7575
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
7676
<ConfigurationType>Makefile</ConfigurationType>
77-
<PlatformToolset>v120</PlatformToolset>
77+
<PlatformToolset>v140</PlatformToolset>
7878
</PropertyGroup>
7979
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
8080
<ConfigurationType>Makefile</ConfigurationType>
81-
<PlatformToolset>v120</PlatformToolset>
81+
<PlatformToolset>v140</PlatformToolset>
8282
</PropertyGroup>
8383
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
8484
<ConfigurationType>Makefile</ConfigurationType>
85-
<PlatformToolset>v120</PlatformToolset>
85+
<PlatformToolset>v140</PlatformToolset>
8686
</PropertyGroup>
8787
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
8888
<ConfigurationType>Makefile</ConfigurationType>
89-
<PlatformToolset>v120</PlatformToolset>
89+
<PlatformToolset>v140</PlatformToolset>
9090
</PropertyGroup>
9191
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
9292
<ConfigurationType>Makefile</ConfigurationType>
93-
<PlatformToolset>v120_xp</PlatformToolset>
93+
<PlatformToolset>v140</PlatformToolset>
9494
</PropertyGroup>
9595
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
9696
<ConfigurationType>Makefile</ConfigurationType>
97-
<PlatformToolset>v120_xp</PlatformToolset>
97+
<PlatformToolset>v140</PlatformToolset>
9898
</PropertyGroup>
9999
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
100100
<ConfigurationType>Makefile</ConfigurationType>
101-
<PlatformToolset>v120</PlatformToolset>
101+
<PlatformToolset>v140</PlatformToolset>
102102
</PropertyGroup>
103103
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
104104
<ConfigurationType>Makefile</ConfigurationType>
105-
<PlatformToolset>v120</PlatformToolset>
105+
<PlatformToolset>v140</PlatformToolset>
106106
</PropertyGroup>
107107
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
108108
<ImportGroup Label="ExtensionSettings">

0 commit comments

Comments
 (0)