Use Qt5.7 for appveyor.

Also use gcc 5.3 shipped by Qt.

Resolves GH-231.

(cherry picked from commit ee6d3c8ffac3da41346c0f396a4a780714cdbea1)

diff --git a/appveyor.yml b/appveyor.yml
index e87b983..dc1419e 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -138,7 +138,7 @@ build_script:
     NsisDeployImage $env:APPVEYOR_BUILD_FOLDER\scripts\build\NullsoftInstaller.nsi
 
 environment:
-    QT_VER: 5.6
+    QT_VER: 5.7
 
     matrix:
     #msvc
@@ -146,7 +146,7 @@ environment:
     - COMPILER: msvc2015
 
     #mingw
-    - COMPILER: mingw49_32
+    - COMPILER: mingw53_32
 
 test: off
 

diff --git a/scripts/build/appveyorHelp.psm1 b/scripts/build/appveyorHelp.psm1
index 5c9cbfc..3cbf468 100644 (file)
--- 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"))
     {