TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

windows/msvc: Make mpy-cross independent of micropython variant.

Browse Source 
The variant.props may have incompatible build options which break
the mpy-cross build and in any case mpy-cross has nothing to do
with variant support.
This commit is contained in:
stijn
2023-01-24 10:56:26 +01:00
committed by Damien George
parent 55a76f4edd
commit 65941ea0e5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ports/windows/msvc/common.props
View File

@@ -3,14 +3,14 @@
<!-- Variant support. For compatibility with how it works for the other ports, this gets imported <!-- Variant support. For compatibility with how it works for the other ports, this gets imported
early so variants cannot override build options like the ones specified in the rest of this file. early so variants cannot override build options like the ones specified in the rest of this file.
Use CustomPropsFile (see the .vcxproj file) for that. --> Use CustomPropsFile (see the .vcxproj file) for that. -->
<PropertyGroup> <PropertyGroup Condition="'$(PyBuildingMpyCross)' != 'True'">
<PyVariant Condition="'$(PyVariant)' == ''">standard</PyVariant> <PyVariant Condition="'$(PyVariant)' == ''">standard</PyVariant>
<PyBuild Condition="'$(PyBuild)' == ''">build-$(PyVariant)</PyBuild> <PyBuild Condition="'$(PyBuild)' == ''">build-$(PyVariant)</PyBuild>
<PyProg Condition="'$(PyProg)' == ''">micropython</PyProg> <PyProg Condition="'$(PyProg)' == ''">micropython</PyProg>
</PropertyGroup> </PropertyGroup>
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="paths.props" Condition="'$(PyPathsIncluded)' != 'True'"/> <Import Project="paths.props" Condition="'$(PyPathsIncluded)' != 'True'"/>
<Import Project="$(PyVariantDir)mpconfigvariant.props"/> <Import Condition="'$(PyBuildingMpyCross)' != 'True'" Project="$(PyVariantDir)mpconfigvariant.props"/>
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup> <PropertyGroup>