Skip to content

Commit c611313

Browse files
stinosdpgeorge
authored andcommitted
windows: Make msvc project file support any version from VS2013 to VS2017
Instead of having the PlatformToolset property hardcoded to a specific version just set it to the value of DefaultPlatformToolset: this gets defined according to the commandline environment in which the build was started. Instead of just supporting VS2015 the project can now be built by any version from VS2013 to VS2017 and normally future versions as well, without quirks like VS asking whether you want to upgrade the project to the latest version (as was the case when opening the project in VS2017) or not being able to build at all (as was the case when opening the project in VS2013). Also adjust the .gitignore file to ignore any artefacts from VS2017.
1 parent 92cd000 commit c611313

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

windows/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@
77
*.ilk
88
*.filters
99
/build/*
10+
.vs/*
1011
*.VC.*db

windows/micropython.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,26 @@
2626
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2727
<ConfigurationType>Application</ConfigurationType>
2828
<UseDebugLibraries>true</UseDebugLibraries>
29-
<PlatformToolset>v140</PlatformToolset>
29+
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
3030
<CharacterSet>MultiByte</CharacterSet>
3131
</PropertyGroup>
3232
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3333
<ConfigurationType>Application</ConfigurationType>
3434
<UseDebugLibraries>false</UseDebugLibraries>
35-
<PlatformToolset>v140</PlatformToolset>
35+
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
3636
<WholeProgramOptimization>true</WholeProgramOptimization>
3737
<CharacterSet>MultiByte</CharacterSet>
3838
</PropertyGroup>
3939
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4040
<ConfigurationType>Application</ConfigurationType>
4141
<UseDebugLibraries>true</UseDebugLibraries>
42-
<PlatformToolset>v140</PlatformToolset>
42+
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
4343
<CharacterSet>MultiByte</CharacterSet>
4444
</PropertyGroup>
4545
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4646
<ConfigurationType>Application</ConfigurationType>
4747
<UseDebugLibraries>false</UseDebugLibraries>
48-
<PlatformToolset>v140</PlatformToolset>
48+
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
4949
<WholeProgramOptimization>true</WholeProgramOptimization>
5050
<CharacterSet>MultiByte</CharacterSet>
5151
</PropertyGroup>

0 commit comments

Comments
 (0)