X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=scripts%2Fbuild%2FappveyorHelp.psm1;fp=scripts%2Fbuild%2FappveyorHelp.psm1;h=3cbf46815c59d1b934da2f6fe959c907bb1f66bb;hp=5c9cbfcee26e688b4598dbcefe9421683cc9541f;hb=ee6d3c8ffac3da41346c0f396a4a780714cdbea1;hpb=aebc2f7d1808b4ead2e0370f064ae3935c585840 diff --git a/scripts/build/appveyorHelp.psm1 b/scripts/build/appveyorHelp.psm1 index 5c9cbfce..3cbf4681 100644 --- a/scripts/build/appveyorHelp.psm1 +++ b/scripts/build/appveyorHelp.psm1 @@ -69,14 +69,25 @@ function SETUP-QT() $script:QT_BINARY_DIRS = @($qtDir) BAT-CALL "$qtDir\bin\qtenv2.bat" - if ($compiler.StartsWith("mingw49")) + + if ($compiler.StartsWith("mingw")) { + # supported values are + #mingw49_32 + #mingw53_32 #remove sh.exe from path $env:PATH=$env:PATH -replace "C:\\Program Files \(x86\)\\Git\\bin", "" $script:MAKE="mingw32-make" $script:CMAKE_GENERATOR="MinGW Makefiles" $script:STRIP=@("strip", "-s") - $script:QT_BINARY_DIRS += (Resolve-Path "$qtDir\..\..\Tools\mingw492_32\opt\") + if ($compiler -eq "mingw49_32") + { + $script:QT_BINARY_DIRS += (Resolve-Path "$qtDir\..\..\Tools\mingw492_32\opt\") + } + elseif ($compiler -eq "mingw53_32") + { + $script:QT_BINARY_DIRS += (Resolve-Path "$qtDir\..\..\Tools\mingw530_32\opt\") + } } elseif ($compiler.StartsWith("msvc")) {