diff --git a/mpy-cross/mpy-cross.vcxproj b/mpy-cross/mpy-cross.vcxproj
index 53cb0fa1fe..322d8c25d1 100644
--- a/mpy-cross/mpy-cross.vcxproj
+++ b/mpy-cross/mpy-cross.vcxproj
@@ -24,7 +24,6 @@
True
$(MSBuildThisFileDirectory)build\
$(MSBuildThisFileDirectory)
- $(MSBuildThisFileDirectory)
$(MSBuildThisFileDirectory)..\ports\windows\msvc\
diff --git a/ports/windows/.appveyor.yml b/ports/windows/.appveyor.yml
index 110511fe22..41b554b2d9 100644
--- a/ports/windows/.appveyor.yml
+++ b/ports/windows/.appveyor.yml
@@ -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"
}
diff --git a/ports/windows/README.md b/ports/windows/README.md
index 1fa8008910..7b5f92f10a 100644
--- a/ports/windows/README.md
+++ b/ports/windows/README.md
@@ -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 .
diff --git a/ports/windows/msvc/paths.props b/ports/windows/msvc/paths.props
index 1a41919328..767772a1aa 100644
--- a/ports/windows/msvc/paths.props
+++ b/ports/windows/msvc/paths.props
@@ -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. -->
$([System.IO.Path]::GetFullPath(`$(MSBuildThisFileDirectory)..\..\..`))\
$(PyBaseDir)ports\windows\
$(PyWinDir)$(PyBuild)\
$(PyWinDir)variants\$(PyVariant)\
- $(PyWinDir)
+ $(PyBuildDir)
$(PyIncDirs);$(PyBaseDir);$(PyWinDir);$(PyBuildDir);$(PyWinDir)msvc;$(PyVariantDir)
diff --git a/tests/run-internalbench.py b/tests/run-internalbench.py
index 0d21978501..b71b38cab8 100755
--- a/tests/run-internalbench.py
+++ b/tests/run-internalbench.py
@@ -13,7 +13,9 @@ from collections import defaultdict
# to the correct executable.
if os.name == "nt":
CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3.exe")
- MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/windows/micropython.exe")
+ MICROPYTHON = os.getenv(
+ "MICROPY_MICROPYTHON", "../ports/windows/build-standard/micropython.exe"
+ )
else:
CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/build-standard/micropython")
diff --git a/tests/run-multitests.py b/tests/run-multitests.py
index 70bae59474..2fd5f027e7 100755
--- a/tests/run-multitests.py
+++ b/tests/run-multitests.py
@@ -27,7 +27,9 @@ import pyboard
if os.name == "nt":
CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3.exe")
- MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", test_dir + "/../ports/windows/micropython.exe")
+ MICROPYTHON = os.getenv(
+ "MICROPY_MICROPYTHON", test_dir + "/../ports/windows/build-standard/micropython.exe"
+ )
else:
CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
MICROPYTHON = os.getenv(
diff --git a/tests/run-perfbench.py b/tests/run-perfbench.py
index f87169d491..578f975bb8 100755
--- a/tests/run-perfbench.py
+++ b/tests/run-perfbench.py
@@ -18,7 +18,9 @@ prepare_script_for_target = __import__("run-tests").prepare_script_for_target
# Paths for host executables
if os.name == "nt":
CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3.exe")
- MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/windows/micropython.exe")
+ MICROPYTHON = os.getenv(
+ "MICROPY_MICROPYTHON", "../ports/windows/build-standard/micropython.exe"
+ )
else:
CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/build-standard/micropython")
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 35740318e2..02cad5aed8 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -30,9 +30,11 @@ def base_path(*p):
# to the correct executable.
if os.name == "nt":
CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python")
- MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", base_path("../ports/windows/micropython.exe"))
+ MICROPYTHON = os.getenv(
+ "MICROPY_MICROPYTHON", base_path("../ports/windows/build-standard/micropython.exe")
+ )
# mpy-cross is only needed if --via-mpy command-line arg is passed
- MPYCROSS = os.getenv("MICROPY_MPYCROSS", base_path("../mpy-cross/mpy-cross.exe"))
+ MPYCROSS = os.getenv("MICROPY_MPYCROSS", base_path("../mpy-cross/build/mpy-cross.exe"))
else:
CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
MICROPYTHON = os.getenv(
diff --git a/tools/gen-cpydiff.py b/tools/gen-cpydiff.py
index de69a94673..29545bad0b 100644
--- a/tools/gen-cpydiff.py
+++ b/tools/gen-cpydiff.py
@@ -38,7 +38,9 @@ from collections import namedtuple
# to the correct executable.
if os.name == "nt":
CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3.exe")
- MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/windows/micropython.exe")
+ MICROPYTHON = os.getenv(
+ "MICROPY_MICROPYTHON", "../ports/windows/build-standard/micropython.exe"
+ )
else:
CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/build-standard/micropython")