Fixes.
This commit is contained in:
parent
7debd364ce
commit
58f8e01f76
11
appveyor.yml
11
appveyor.yml
|
@ -353,6 +353,7 @@ for:
|
||||||
# Trick qmake to not work through MSYS
|
# Trick qmake to not work through MSYS
|
||||||
- del /F "C:\Program Files\Git\usr\bin\sh.exe"
|
- del /F "C:\Program Files\Git\usr\bin\sh.exe"
|
||||||
- del /F "C:\Program Files\Git\bin\sh.exe"
|
- del /F "C:\Program Files\Git\bin\sh.exe"
|
||||||
|
- dir "%QTDIR%\bin"
|
||||||
- qmake.exe -v
|
- qmake.exe -v
|
||||||
- qbs --version
|
- qbs --version
|
||||||
|
|
||||||
|
@ -430,9 +431,9 @@ for:
|
||||||
if ($env:COMPILER -eq "msvc") {
|
if ($env:COMPILER -eq "msvc") {
|
||||||
if ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2022") {
|
if ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2022") {
|
||||||
if ($env:ARCH -eq "x64") {
|
if ($env:ARCH -eq "x64") {
|
||||||
& "C:\Program Files (x86)\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
|
& "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
|
||||||
} else {
|
} else {
|
||||||
& "C:\Program Files (x86)\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars32.bat"
|
& "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars32.bat"
|
||||||
}
|
}
|
||||||
} elseif ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2019") {
|
} elseif ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2019") {
|
||||||
if ($env:ARCH -eq "x64") {
|
if ($env:ARCH -eq "x64") {
|
||||||
|
@ -448,10 +449,10 @@ for:
|
||||||
}
|
}
|
||||||
} elseif ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2015") {
|
} elseif ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2015") {
|
||||||
if ($env:ARCH -eq "x64") {
|
if ($env:ARCH -eq "x64") {
|
||||||
'& "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64'
|
& "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
|
||||||
'& "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64'
|
& "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64
|
||||||
} else {
|
} else {
|
||||||
'& "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86'
|
& "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user