diff options
Diffstat (limited to 'build-scripts')
| -rwxr-xr-x | build-scripts/build-windows | 6 | ||||
| -rw-r--r-- | build-scripts/build-windows.bat | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/build-scripts/build-windows b/build-scripts/build-windows index 81543668..e08b653e 100755 --- a/build-scripts/build-windows +++ b/build-scripts/build-windows @@ -6,16 +6,14 @@ tool=$2 if [[ $tool == mingw ]]; then pacman -Sy --noconfirm make base-devel tar zip unzip - if [ -d /c/msys64 ]; then - PATH="/c/msys64/mingw$wordsize/bin:$PATH" - else + if [ ! -x /c/msys64/mingw$wordsize/bin/g++.exe ]; then if [[ $wordsize == 64 ]]; then pacman -Sy --noconfirm mingw-w64-x86_64-toolchain else pacman -Sy --noconfirm mingw-w64-i686-toolchain fi - PATH="/c/tools/msys64/mingw$wordsize/bin:$PATH" fi + PATH="/c/msys64/mingw$wordsize/bin:$PATH" g++ -v elif [[ $tool == msvc ]]; then cl diff --git a/build-scripts/build-windows.bat b/build-scripts/build-windows.bat index 0f81ebf3..e82e0f71 100644 --- a/build-scripts/build-windows.bat +++ b/build-scripts/build-windows.bat @@ -3,9 +3,9 @@ setlocal ENABLEDELAYEDEXPANSION if %2 == msvc ( if %1 == 64 ( - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" ) else ( - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars32.bat" + call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars32.bat" ) choco install zip bash ./build-scripts/build-windows %1 %2 |