diff options
| author | stijn <stijn@ignitron.net> | 2017-03-20 16:15:46 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2017-03-23 15:44:27 +1100 |
| commit | c61131380da73221a6590f7898d68b35a8450891 (patch) | |
| tree | 5c6656421caf111c12ec16a08d8f095f1f14464e | |
| parent | 92cd0008428d5db6e8cf3ae531cdb24acdfb68e1 (diff) | |
| download | micropython-c61131380da73221a6590f7898d68b35a8450891.tar.gz micropython-c61131380da73221a6590f7898d68b35a8450891.zip | |
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.
| -rw-r--r-- | windows/.gitignore | 1 | ||||
| -rw-r--r-- | windows/micropython.vcxproj | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/windows/.gitignore b/windows/.gitignore index ec28212111..12235e7c9e 100644 --- a/windows/.gitignore +++ b/windows/.gitignore @@ -7,4 +7,5 @@ *.ilk *.filters /build/* +.vs/* *.VC.*db diff --git a/windows/micropython.vcxproj b/windows/micropython.vcxproj index 6f6e11ab4a..ee0b98abba 100644 --- a/windows/micropython.vcxproj +++ b/windows/micropython.vcxproj @@ -26,26 +26,26 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> |