Skip to content

Commit 0f1973b

Browse files
committed
Attempt to migrate from MINGW64 to UCRT64 as arm-none-eabi-gcc is not available anymore in MINGW64
cf msys2/MINGW-packages@bb41250
1 parent 5666cdf commit 0f1973b

5 files changed

Lines changed: 14 additions & 14 deletions

File tree

.github/workflows/windows.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ jobs:
2323
run:
2424
shell: pwsh
2525
env:
26-
PATH: C:/ProxSpace/msys2/mingw64/bin;C:/ProxSpace/msys2/usr/local/bin;C:/ProxSpace/msys2/usr/bin;C:/ProxSpace/msys2/bin
27-
MSYSTEM: MINGW64
28-
PYTHONHOME: /mingw64
26+
PATH: C:/ProxSpace/msys2/ucrt64/bin;C:/ProxSpace/msys2/usr/local/bin;C:/ProxSpace/msys2/usr/bin;C:/ProxSpace/msys2/bin
27+
MSYSTEM: UCRT64
28+
PYTHONHOME: /ucrt64
2929

3030
steps:
3131
- name: ProxSpace download
@@ -54,7 +54,7 @@ jobs:
5454
Write-Host "Attempt $i..."
5555
./runme64.bat -c "exit"
5656
if ($LASTEXITCODE -eq 0) {
57-
./runme64.bat -c "pacman -Syu --noconfirm mingw-w64-x86_64-qt6-base"
57+
./runme64.bat -c "pacman -Syu --noconfirm mingw-w64-ucrt-x86_64-qt6-base"
5858
exit 0
5959
}
6060
if ($i -lt $maxAttempts) { Start-Sleep -Seconds $delay }

.vscode/tasks.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"options": {
77
"cwd": "${workspaceFolder}",
88
"env": {
9-
"PATH": "${workspaceFolder}/../../msys2/mingw64/bin;${workspaceFolder}/../../msys2/usr/local/bin;${workspaceFolder}/../../msys2/usr/bin;${workspaceFolder}/../../msys2/bin",
10-
"MSYSTEM": "MINGW64"
9+
"PATH": "${workspaceFolder}/../../msys2/ucrt64/bin;${workspaceFolder}/../../msys2/usr/local/bin;${workspaceFolder}/../../msys2/usr/bin;${workspaceFolder}/../../msys2/bin",
10+
"MSYSTEM": "UCRT64"
1111
}
1212
}
1313
},

.vscode/templates/launch_ps.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"options": {
77
"cwd": "${workspaceFolder}",
88
"env": {
9-
"PATH": "${workspaceFolder}/../../msys2/mingw64/bin;${workspaceFolder}/../../msys2/usr/local/bin;${workspaceFolder}/../../msys2/usr/bin;${workspaceFolder}/../../msys2/bin",
10-
"MSYSTEM": "MINGW64"
9+
"PATH": "${workspaceFolder}/../../msys2/ucrt64/bin;${workspaceFolder}/../../msys2/usr/local/bin;${workspaceFolder}/../../msys2/usr/bin;${workspaceFolder}/../../msys2/bin",
10+
"MSYSTEM": "UCRT64"
1111
}
1212
},
1313
"configurations": [
@@ -29,7 +29,7 @@
2929
}
3030
],
3131
"preLaunchTask": "client: Debug: clean & make",
32-
"miDebuggerPath": "${workspaceFolder}/../../msys2/mingw64/bin/gdb.exe"
32+
"miDebuggerPath": "${workspaceFolder}/../../msys2/ucrt64/bin/gdb.exe"
3333
},{
3434
"name": "Firmware: (J-Link) Build & Launch",
3535
"type": "cortex-debug",
@@ -43,7 +43,7 @@
4343
"interface": "jtag",
4444
"serialNumber": "", //If you have more than one J-Link probe, add the serial number here.
4545
"runToMain": false,
46-
"armToolchainPath": "${workspaceFolder}/../../msys2/mingw64/bin"
46+
"armToolchainPath": "${workspaceFolder}/../../msys2/ucrt64/bin"
4747
}
4848
]
4949
}

client/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
# On ProxSpace 3.4:
2424
# cmake -G"MSYS Makefiles" ..
2525
# On Proxspace 3.3 or less, you need to install cmake:
26-
# pacman -S mingw-w64-x86_64-cmake
27-
# /mingw64/bin/cmake -G"MSYS Makefiles" ..
26+
# pacman -S mingw-w64-ucrt-x86_64-cmake
27+
# /ucrt64/bin/cmake -G"MSYS Makefiles" ..
2828
#
2929
# Android cross-compilation: (ANDROID_ABI=arm64-v8a for a 64b version)
3030
# cmake \

client/experimental_lib/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
# On ProxSpace 3.4:
2424
# cmake -G"MSYS Makefiles" ..
2525
# On Proxspace 3.3 or less, you need to install cmake:
26-
# pacman -S mingw-w64-x86_64-cmake
27-
# /mingw64/bin/cmake -G"MSYS Makefiles" ..
26+
# pacman -S mingw-w64-ucrt-x86_64-cmake
27+
# /ucrt64/bin/cmake -G"MSYS Makefiles" ..
2828
#
2929
# Android cross-compilation: (ANDROID_ABI=arm64-v8a for a 64b version)
3030
# cmake \

0 commit comments

Comments
 (0)