diff options
Diffstat (limited to 'build-scripts/build-windows.bat')
-rw-r--r-- | build-scripts/build-windows.bat | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/build-scripts/build-windows.bat b/build-scripts/build-windows.bat index 8be269e9..0f81ebf3 100644 --- a/build-scripts/build-windows.bat +++ b/build-scripts/build-windows.bat @@ -1,5 +1,6 @@ @echo on @rem Usage: build-windows {32|64} {msvc|mingw} +setlocal ENABLEDELAYEDEXPANSION if %2 == msvc ( if %1 == 64 ( call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" @@ -9,8 +10,11 @@ if %2 == msvc ( choco install zip bash ./build-scripts/build-windows %1 %2 ) else ( - @rem The vs2017-win2016 pool has an ancient 64-bit-only mingw. - @rem Install msys2 so we can get current gcc toolchains. - choco install msys2 - C:\tools\msys64\usr\bin\env.exe MSYSTEM=MINGW64 /bin/bash -l %CD%/build-scripts/build-windows %1 %2 + if exist C:\msys64 ( + set MSYS=C:\msys64 + ) else ( + choco install msys2 + set MSYS=C:\tools\msys64 + ) + !MSYS!\usr\bin\env.exe MSYSTEM=MINGW64 /bin/bash -l %CD%/build-scripts/build-windows %1 %2 ) |