diff options
| author | stijn <stijn@ignitron.net> | 2023-01-23 11:33:27 +0100 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2023-02-01 13:10:00 +1100 |
| commit | 55a76f4edd894ee7c5709c66fcc6f1c3a8905723 (patch) | |
| tree | 1eec88fc4f4b5150fb88d970b5334440d50a8164 | |
| parent | 6250337c9cf725238df19104f7bf801e91b56e1a (diff) | |
windows/msvc: Remove variant suffix from executable filename.
This is in line with the change made for other ports in d53c3b6a: since
the default output directory already includes the variant name in it
there's no need to add it to the executable as well.
| -rw-r--r-- | ports/windows/msvc/common.props | 1 | ||||
| -rw-r--r-- | ports/windows/variants/dev/mpconfigvariant.props | 3 | ||||
| -rw-r--r-- | ports/windows/variants/standard/mpconfigvariant.props | 3 |
3 files changed, 1 insertions, 6 deletions
diff --git a/ports/windows/msvc/common.props b/ports/windows/msvc/common.props index 7700d9f09..d949e3df4 100644 --- a/ports/windows/msvc/common.props +++ b/ports/windows/msvc/common.props @@ -6,6 +6,7 @@ <PropertyGroup> <PyVariant Condition="'$(PyVariant)' == ''">standard</PyVariant> <PyBuild Condition="'$(PyBuild)' == ''">build-$(PyVariant)</PyBuild> + <PyProg Condition="'$(PyProg)' == ''">micropython</PyProg> </PropertyGroup> <ImportGroup Label="PropertySheets"> <Import Project="paths.props" Condition="'$(PyPathsIncluded)' != 'True'"/> diff --git a/ports/windows/variants/dev/mpconfigvariant.props b/ports/windows/variants/dev/mpconfigvariant.props index 0f7abf781..14ce01a81 100644 --- a/ports/windows/variants/dev/mpconfigvariant.props +++ b/ports/windows/variants/dev/mpconfigvariant.props @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0"> - <PropertyGroup> - <PyProg>micropython-dev</PyProg> - </PropertyGroup> <ItemDefinitionGroup> <ClCompile> <PreprocessorDefinitions>%(PreprocessorDefinitions);MICROPY_ROM_TEXT_COMPRESSION=1</PreprocessorDefinitions> diff --git a/ports/windows/variants/standard/mpconfigvariant.props b/ports/windows/variants/standard/mpconfigvariant.props index 3cbb1821f..9296da44b 100644 --- a/ports/windows/variants/standard/mpconfigvariant.props +++ b/ports/windows/variants/standard/mpconfigvariant.props @@ -1,6 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0"> - <PropertyGroup> - <PyProg>micropython</PyProg> - </PropertyGroup> </Project> |