appveyor: Add Visual Studio build to the build matrix

The build is now performed both under MinGW, and under Visual Studio.
The build released as artifact is still the MinGW one.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>

CI/appveyor/mingw/build.sh

@@ -1,6 +1,6 @@
 #!/c/msys64/usr/bin/bash -l
 
-export PATH=/mingw64/bin:$PATH
+export PATH=/mingw64/bin:/c/Program\ Files\ \(x86\)/Inno\ Setup\ 5:$PATH
 
 # Exit immediately upon error
 set -e
@@ -24,3 +24,7 @@ cmake -G 'Unix Makefiles' \
 	/c/projects/pioneer
 
 cmake --build . --target install
+
+# Create the installer and upload artifact
+ISCC pioneer.iss
+appveyor PushArtifact ../pioneer-setup.exe

CI/appveyor/msvc/build.sh

@@ -0,0 +1,19 @@
+#!/c/msys64/usr/bin/bash -l
+
+# Exit immediately upon error
+set -e
+
+# Echo the commands
+set +v
+
+mkdir -p /c/projects/pioneer/build
+cd /c/projects/pioneer/build
+
+cmake -G 'Visual Studio 15 Win64' \
+	-DCMAKE_INSTALL_PREFIX="/c/Program Files/Pioneer" \
+	-DPIONEER_DATA_DIR="/c/Program Files/Pioneer/data" \
+	-DCMAKE_BUILD_TYPE:STRING=Release \
+	-DGIT_EXECUTABLE=/c/Program\\ Files/Git/cmd/git.exe \
+	/c/projects/pioneer
+
+cmake --build . --config Release --target pioneer

CI/appveyor/msvc/prepare.sh

@@ -0,0 +1,7 @@
+#!/c/msys64/usr/bin/bash -l
+
+# Exit immediately upon error
+set -e
+
+cd /c/projects/pioneer
+git clone --depth 1 git://github.com/pioneerspacesim/pioneer-thirdparty

appveyor.yml

@@ -1,17 +1,14 @@
 clone_depth: 1
+image: Visual Studio 2017
+
+environment:
+  matrix:
+    - TARGET: msvc
+    - TARGET: mingw
 
 install:
-    - cd C:\projects\pioneer
-    - C:\msys64\usr\bin\bash -l /c/projects/pioneer/CI/appveyor/prepare.sh
-
-    #Install Inno Setup
-    - choco install InnoSetup
-    - set PATH=%PATH%;"C:\Program Files (x86)\Inno Setup 5"
+    - IF "%TARGET%"=="mingw" (choco install InnoSetup)
+    - C:\msys64\usr\bin\bash -l /c/projects/pioneer/CI/appveyor/%TARGET%/prepare.sh
 
 build_script:
-    - cd C:\projects\pioneer
-    - C:\msys64\usr\bin\bash -l /c/projects/pioneer/CI/appveyor/build.sh
-
-    #Create the installer and upload artifact
-    - ISCC C:\projects\pioneer\build\pioneer.iss
-    - appveyor PushArtifact C:\projects\pioneer\pioneer-setup.exe
+    - C:\msys64\usr\bin\bash -l /c/projects/pioneer/CI/appveyor/%TARGET%/build.sh