diff --git a/.appveyor.yml b/.appveyor.yml
index 57b99151..251f0f38 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,4 +1,4 @@
-version: 1.0.{build}
+version: 2.x.{build}
 
 environment:
   global:
@@ -6,31 +6,86 @@ environment:
   matrix:
     - BUILD_TYPE: MinSizeRel
       COMPILER: MinGW-w32
+      COMPILER_FAMILY: MinGW
+      GENERATOR: "MinGW Makefiles"
       PLATFORM: Win32-VB6-Binding
+      EXTRA_CMAKE_FLAGS: "-DBUILD_AS_VB6_BINDING=ON"
     - BUILD_TYPE: Debug
-      COMPILER: MSVC15
+      COMPILER: MinGW
+      COMPILER_FAMILY: MinGW
+      GENERATOR: "MinGW Makefiles"
+      PLATFORM: Win32
+    - BUILD_TYPE: Release
+      COMPILER: MinGW
+      COMPILER_FAMILY: MinGW
+      GENERATOR: "MinGW Makefiles"
+      PLATFORM: Win32
+    - BUILD_TYPE: Debug
+      COMPILER: MinGW-w64
+      COMPILER_FAMILY: MinGW
+      GENERATOR: "MinGW Makefiles"
       PLATFORM: x64
     - BUILD_TYPE: Release
-      COMPILER: MSVC15
+      COMPILER: MinGW-w64
+      COMPILER_FAMILY: MinGW
+      GENERATOR: "MinGW Makefiles"
       PLATFORM: x64
     - BUILD_TYPE: Debug
       COMPILER: MSVC15
-      PLATFORM: Win32
+      COMPILER_FAMILY: MSVC
+      GENERATOR: "Visual Studio 14 2015 Win64"
+      APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
+      PLATFORM: x64
+      PLATFORMTOOLSET: "v140_xp"
     - BUILD_TYPE: Release
       COMPILER: MSVC15
-      PLATFORM: Win32
+      COMPILER_FAMILY: MSVC
+      GENERATOR: "Visual Studio 14 2015 Win64"
+      APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
+      PLATFORM: x64
+      PLATFORMTOOLSET: "v140_xp"
     - BUILD_TYPE: Debug
-      COMPILER: MinGW
+      COMPILER: MSVC15
+      COMPILER_FAMILY: MSVC
+      GENERATOR: "Visual Studio 14 2015"
+      APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
       PLATFORM: Win32
+      PLATFORMTOOLSET: "v140_xp"
     - BUILD_TYPE: Release
-      COMPILER: MinGW
+      COMPILER: MSVC15
+      COMPILER_FAMILY: MSVC
+      GENERATOR: "Visual Studio 14 2015"
+      APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
       PLATFORM: Win32
+      PLATFORMTOOLSET: "v140_xp"
     - BUILD_TYPE: Debug
-      COMPILER: MinGW-w64
+      COMPILER: MSVC17
+      COMPILER_FAMILY: MSVC
+      GENERATOR: "Visual Studio 15 2017 Win64"
+      APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
       PLATFORM: x64
+      PLATFORMTOOLSET: "v141_xp"
     - BUILD_TYPE: Release
-      COMPILER: MinGW-w64
+      COMPILER: MSVC17
+      COMPILER_FAMILY: MSVC
+      GENERATOR: "Visual Studio 15 2017 Win64"
+      APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
       PLATFORM: x64
+      PLATFORMTOOLSET: "v141_xp"
+    - BUILD_TYPE: Debug
+      COMPILER: MSVC17
+      COMPILER_FAMILY: MSVC
+      GENERATOR: "Visual Studio 15 2017"
+      APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
+      PLATFORM: Win32
+      PLATFORMTOOLSET: "v141_xp"
+    - BUILD_TYPE: Release
+      COMPILER: MSVC17
+      COMPILER_FAMILY: MSVC
+      GENERATOR: "Visual Studio 15 2017"
+      APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
+      PLATFORM: Win32
+      PLATFORMTOOLSET: "v141_xp"
 
 build_script:
   - md build-%COMPILER%-%BUILD_TYPE%-%PLATFORM%
@@ -38,19 +93,10 @@ build_script:
   - if [%COMPILER%]==[MinGW] set PATH=C:\MinGW\bin;%PATH:C:\Program Files\Git\usr\bin;=%
   - if [%COMPILER%]==[MinGW-w32] set PATH=C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin;%PATH:C:\Program Files\Git\usr\bin;=%
   - if [%COMPILER%]==[MinGW-w64] set PATH=C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH:C:\Program Files\Git\usr\bin;=%
-  - if [%COMPILER%]==[MinGW] if [%PLATFORM%]==[Win32] cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DCMAKE_PREFIX_PATH=. -DCMAKE_INSTALL_PREFIX=SDL-Mixer-X -DDOWNLOAD_AUDIO_CODECS_DEPENDENCY=YES ..
-  - if [%COMPILER%]==[MinGW-w32] if [%PLATFORM%]==[Win32-VB6-Binding] cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DBUILD_AS_VB6_BINDING=ON -DCMAKE_PREFIX_PATH=. -DCMAKE_INSTALL_PREFIX=SDL-Mixer-X -DDOWNLOAD_AUDIO_CODECS_DEPENDENCY=YES ..
-  - if [%COMPILER%]==[MinGW-w32] if NOT [%PLATFORM%]==[Win32-VB6-Binding] cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DCMAKE_PREFIX_PATH=. -DCMAKE_INSTALL_PREFIX=SDL-Mixer-X -DDOWNLOAD_AUDIO_CODECS_DEPENDENCY=YES ..
-  - if [%COMPILER%]==[MinGW-w64] cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DCMAKE_PREFIX_PATH=. -DCMAKE_INSTALL_PREFIX=SDL-Mixer-X -DDOWNLOAD_AUDIO_CODECS_DEPENDENCY=YES ..
-  - if [%COMPILER%]==[MSVC15] if [%PLATFORM%]==[Win32] cmake -G "Visual Studio 14 2015" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DCMAKE_PREFIX_PATH=. -DCMAKE_INSTALL_PREFIX=SDL-Mixer-X -DDOWNLOAD_AUDIO_CODECS_DEPENDENCY=YES ..
-  - if [%COMPILER%]==[MSVC15] if [%PLATFORM%]==[x64] cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DCMAKE_PREFIX_PATH=. -DCMAKE_INSTALL_PREFIX=SDL-Mixer-X -DDOWNLOAD_AUDIO_CODECS_DEPENDENCY=YES ..
-  - if [%COMPILER%]==[MinGW] cmake --build . --config %BUILD_TYPE% -- -j 2
-  - if [%COMPILER%]==[MinGW] mingw32-make install
-  - if [%COMPILER%]==[MinGW-w32] cmake --build . --config %BUILD_TYPE% -- -j 2
-  - if [%COMPILER%]==[MinGW-w32] mingw32-make install
-  - if [%COMPILER%]==[MinGW-w64] cmake --build . --config %BUILD_TYPE% -- -j 2
-  - if [%COMPILER%]==[MinGW-w64] mingw32-make install
-  - if [%COMPILER%]==[MSVC15] cmake --build . --config %BUILD_TYPE% --target install
+  - cmake -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DCMAKE_PREFIX_PATH=. -DCMAKE_INSTALL_PREFIX=SDL-Mixer-X -DDOWNLOAD_AUDIO_CODECS_DEPENDENCY=YES %EXTRA_CMAKE_FLAGS% ..
+  - if [%COMPILER_FAMILY%]==[MinGW] cmake --build . --config %BUILD_TYPE% -- -j 2
+  - if [%COMPILER_FAMILY%]==[MinGW] mingw32-make install
+  - if [%COMPILER_FAMILY%]==[MSVC] cmake --build . --config %BUILD_TYPE% --target install
   - if NOT [%PLATFORM%]==[Win32-VB6-Binding] 7z a -t7z -mx9 "SDL-Mixer-X-%COMPILER%-%BUILD_TYPE%-%PLATFORM%.7z" "SDL-Mixer-X"
   - if [%PLATFORM%]==[Win32-VB6-Binding] 7z x ../VB6_Wrapper/SDL_Mixer_vb6_example.clean.7z * -osdl-mixer-vb6
   - if [%PLATFORM%]==[Win32-VB6-Binding] copy ..\VB6_Wrapper\ReadME.txt sdl-mixer-vb6