TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

all: Keep msvc build output in build/ directories.

Browse Source 
This follow the change made for Makefile-based projects in b2e82402.
This commit is contained in:
stijn
2022-11-29 16:58:21 +01:00
committed by Damien George
parent db19ee7e15
commit 9c7ff87643
9 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ports/windows/.appveyor.yml
View File

@@ -78,7 +78,7 @@ after_test:
if ($LASTEXITCODE -ne 0) {
throw "$env:MSYSTEM build exited with code $LASTEXITCODE"
}
C:\msys64\usr\bin\bash.exe -l -c "make -B -j4 V=1 MICROPY_MPYCROSS=../../mpy-cross/mpy-cross.exe VARIANT=$($env:PyVariant)"
C:\msys64\usr\bin\bash.exe -l -c "make -B -j4 V=1 MICROPY_MPYCROSS=../../mpy-cross/build/mpy-cross.exe VARIANT=$($env:PyVariant)"
if ($LASTEXITCODE -ne 0) {
throw "$env:MSYSTEM build exited with code $LASTEXITCODE"
}

2
ports/windows/README.md
View File

@@ -128,7 +128,7 @@ functions and thus should be ran using the `wineconsole` tool. Depending
on the Wine build configuration, you may also want to select the curses
backend which has the look&feel of a standard Unix console:
wineconsole --backend=curses ./micropython.exe
wineconsole --backend=curses ./build-standard/micropython.exe
For more info, see https://www.winehq.org/docs/wineusr-guide/cui-programs .

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

@@ -22,14 +22,14 @@
|- standard [PyVariantDir]
Note that the micropython executable will be copied from PyOutDir
to PyWinDir after each build. -->
to PyTargetDir after each build. -->
<!-- Start from project root -->
<PyBaseDir>$([System.IO.Path]::GetFullPath(`$(MSBuildThisFileDirectory)..\..\..`))\</PyBaseDir>
<PyWinDir>$(PyBaseDir)ports\windows\</PyWinDir>
<PyBuildDir Condition="'$(PyBuildDir)' == ''">$(PyWinDir)$(PyBuild)\</PyBuildDir>
<PyVariantDir Condition="'$(PyVariantDir)' == ''">$(PyWinDir)variants\$(PyVariant)\</PyVariantDir>
<PyTargetDir Condition="'$(PyTargetDir)' == ''">$(PyWinDir)</PyTargetDir>
<PyTargetDir Condition="'$(PyTargetDir)' == ''">$(PyBuildDir)</PyTargetDir>
<!-- All include directories needed for uPy -->
<PyIncDirs>$(PyIncDirs);$(PyBaseDir);$(PyWinDir);$(PyBuildDir);$(PyWinDir)msvc;$(PyVariantDir)</PyIncDirs>