Merge branch 'appveyor-x86-builds'

README.md

@@ -109,7 +109,8 @@ Latest builds from master branch
 --------------------------------
 
 - [Ubuntu PPA](https://launchpad.net/~dobey/+archive/ubuntu/redshift-daily/+packages) (`sudo add-apt-repository ppa:dobey/redshift-daily`)
-- [Windows x64](https://ci.appveyor.com/api/projects/jonls/redshift/artifacts/redshift.zip?branch=master&pr=false)
+- [Windows x86_64](https://ci.appveyor.com/api/projects/jonls/redshift/artifacts/redshift-windows-x86_64.zip?branch=master&job=Environment%3A+arch%3Dx86_64&pr=false)
+- [Windows x86](https://ci.appveyor.com/api/projects/jonls/redshift/artifacts/redshift-windows-i686.zip?branch=master&job=Environment%3A+arch%3Di686&pr=false)
 
 Building from source
 --------------------

appveyor.yml

@@ -2,23 +2,27 @@ image:
 - Visual Studio 2015
 
 environment:
-  MSYS_ARCH: x86_64
+  matrix:
+    - arch: x86_64
+    - arch: i686
 
 build:
   verbosity: detailed
 
 build_script:
-- echo %PATH%
-- set PATH=C:\msys64\usr\bin;C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%
-- set CC=gcc
-- set MSYSTEM=MINGW64
-- bash -lc "pwd"
+- if [%arch%]==[x86_64] (
+    SET "ADD_PATH_CMD=C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin"
+  )
+- if [%arch%]==[i686] (
+    SET "ADD_PATH_CMD=C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin"
+  )
+- set PATH=C:\msys64\usr\bin;%ADD_PATH_CMD%;%PATH%
 - bash -lc "cd $APPVEYOR_BUILD_FOLDER && ./bootstrap"
-- bash -lc "cd $APPVEYOR_BUILD_FOLDER && ./configure --enable-static --disable-shared --disable-drm --disable-randr --disable-vidmode --enable-wingdi --disable-quartz --disable-geoclue --disable-geoclue2 --disable-corelocation --disable-gui --disable-ubuntu --disable-nls --host=x86_64-w64-mingw32"
+- bash -lc "cd $APPVEYOR_BUILD_FOLDER && ./configure --enable-static --disable-shared --disable-drm --disable-randr --disable-vidmode --enable-wingdi --disable-quartz --disable-geoclue --disable-geoclue2 --disable-corelocation --disable-gui --disable-ubuntu --disable-nls --host=$arch-w64-mingw32"
 - bash -lc "cd $APPVEYOR_BUILD_FOLDER && make"
 
 after_build:
 - cmd: >-
-    7z a redshift.zip ./src/redshift.exe COPYING NEWS README.md
+    7z a redshift-windows-%arch%.zip ./src/redshift.exe COPYING NEWS README.md
 
-    appveyor PushArtifact redshift.zip
+    appveyor PushArtifact redshift-windows-%arch%.zip