diff options
| author | stijn <stijn@ignitron.net> | 2023-01-24 10:56:26 +0100 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2023-02-01 13:10:00 +1100 |
| commit | 65941ea0e5c7cc68951b6db606ae81ae983379f7 (patch) | |
| tree | e41bf774c3eddc9eaed7ed2845a58964fbce346d | |
| parent | 55a76f4edd894ee7c5709c66fcc6f1c3a8905723 (diff) | |
windows/msvc: Make mpy-cross independent of micropython variant.
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.
| -rw-r--r-- | ports/windows/msvc/common.props | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ports/windows/msvc/common.props b/ports/windows/msvc/common.props index d949e3df4..55c9c934f 100644 --- a/ports/windows/msvc/common.props +++ b/ports/windows/msvc/common.props @@ -3,14 +3,14 @@ <!-- 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. Use CustomPropsFile (see the .vcxproj file) for that. --> - <PropertyGroup> + <PropertyGroup Condition="'$(PyBuildingMpyCross)' != 'True'"> <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'"/> - <Import Project="$(PyVariantDir)mpconfigvariant.props"/> + <Import Condition="'$(PyBuildingMpyCross)' != 'True'" Project="$(PyVariantDir)mpconfigvariant.props"/> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> |