final appveyor adjustments

appveyor-build.sh

@@ -1,11 +1,8 @@
-# Set env variable for the build architecture
-ARCH=Win64
-
 # Update packages
 pacman -Syu --noconfirm
 
 # Install necessary packages
-pacman -S --noconfirm --needed mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-qt5 mingw-w64-x86_64-ffmpeg mingw-w64-x86_64-openimageio mingw-w64-x86_64-opencolorio 
+pacman -S --noconfirm --needed mingw-w64-$ARCH-toolchain mingw-w64-$ARCH-cmake mingw-w64-$ARCH-ninja mingw-w64-$ARCH-qt5 mingw-w64-$ARCH-ffmpeg mingw-w64-$ARCH-openimageio mingw-w64-$ARCH-opencolorio 
 
 # Generate Ninja Makefiles
 cmake . -G "Ninja" -DCMAKE_BUILD_TYPE=Debug
@@ -16,9 +13,6 @@ ninja
 # Get Git hash
 GITHASH=$(git rev-parse --short=7 HEAD)
 
-# Create build name
-BUILDNAME="Olive-$GITHASH-$ARCH"
-
 # Build finished, time to package
 mkdir olive
 
@@ -43,11 +37,14 @@ do
 	fi
 done
 
+# Create package name
+PKGNAME=Olive-$GITHASH-Windows-$ARCH
+
 # Package installer
 cd ..
 cp app/packaging/windows/nsis/* .
-"/c/Program Files (x86)/NSIS/makensis.exe" -V4 -DX64 "-XOutFile $BUILDNAME.exe" olive.nsi
+"/c/Program Files (x86)/NSIS/makensis.exe" -V4 $NSISDEF "-XOutFile $PKGNAME.exe" olive.nsi
 
 # Package portable
 touch olive/portable
-7z a $BUILDNAME.zip olive
+7z a $PKGNAME.zip olive

appveyor.yml

@@ -5,20 +5,14 @@ branches:
 image: Visual Studio 2015
 environment:
   TRAVIS_REPO_SLUG: olive-editor/olive
-#  matrix:
-#  - MSYSTEM: MINGW64
-#    QTDIR: 5.12\mingw73_64
-#    ARCH: x86_64
-#    QTTOOLS: Tools\mingw730_64
-#    NSISDEF: /DX64
-#  - MSYSTEM: MINGW32
-#    QTDIR: 5.12\mingw73_32
-#    ARCH: i686
-#    QTTOOLS: Tools\mingw730_32
+matrix:
+- MSYSTEM: MINGW64
+ ARCH: x86_64
+ NSISDEF: -DX64
+- MSYSTEM: MINGW32
+ ARCH: i686
 build_script:
 - cmd: appveyor-build.bat
-on_finish:
-- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 artifacts:
 - path: Olive*.zip
   name: Olive Portable