kopia lustrzana https://github.com/micropython/micropython
Merge fc9a2768a1
into 01c31ea804
commit
7b4296d1b6
|
@ -19,6 +19,9 @@
|
||||||
<PyFileCopyCookie>$(PyBuildDir)copycookie$(Configuration)$(Platform)</PyFileCopyCookie>
|
<PyFileCopyCookie>$(PyBuildDir)copycookie$(Configuration)$(Platform)</PyFileCopyCookie>
|
||||||
<CharacterSet>MultiByte</CharacterSet>
|
<CharacterSet>MultiByte</CharacterSet>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(PyBuildingMpyCross)' != 'True'">
|
||||||
|
<PyIncDirs>$(PyIncDirs);$(PyVariantDir)</PyIncDirs>
|
||||||
|
</PropertyGroup>
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>$(PyIncDirs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(PyIncDirs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
|
|
@ -31,8 +31,8 @@
|
||||||
<PyVariantDir Condition="'$(PyVariantDir)' == ''">$(PyWinDir)variants\$(PyVariant)\</PyVariantDir>
|
<PyVariantDir Condition="'$(PyVariantDir)' == ''">$(PyWinDir)variants\$(PyVariant)\</PyVariantDir>
|
||||||
<PyTargetDir Condition="'$(PyTargetDir)' == ''">$(PyBuildDir)</PyTargetDir>
|
<PyTargetDir Condition="'$(PyTargetDir)' == ''">$(PyBuildDir)</PyTargetDir>
|
||||||
|
|
||||||
<!-- All include directories needed for uPy -->
|
<!-- Common include directories needed for uPy -->
|
||||||
<PyIncDirs>$(PyIncDirs);$(PyBaseDir);$(PyWinDir);$(PyBuildDir);$(PyWinDir)msvc;$(PyVariantDir)</PyIncDirs>
|
<PyIncDirs>$(PyIncDirs);$(PyBaseDir);$(PyWinDir);$(PyBuildDir);$(PyWinDir)msvc</PyIncDirs>
|
||||||
|
|
||||||
<!-- Within PyBuildDir different subdirectories are used based on configuration and platform.
|
<!-- Within PyBuildDir different subdirectories are used based on configuration and platform.
|
||||||
By default these are chosen based on the Configuration and Platform properties, but
|
By default these are chosen based on the Configuration and Platform properties, but
|
||||||
|
|
Ładowanie…
Reference in New Issue