From 0b4788e2af7242e970f887170ad55b98fda0c255 Mon Sep 17 00:00:00 2001
From: Bert Belder <bertbelder@gmail.com>
Date: Sun, 10 Dec 2017 03:48:11 +0100
Subject: [PATCH] ci: add gcc and clang builds

---
 .appveyor.yml  | 87 ++++++++++++++++++++++++++++++++++++++++----------
 CMakeLists.txt |  4 +--
 2 files changed, 71 insertions(+), 20 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 99d02e8..e941ae1 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -2,24 +2,73 @@ version: b{build}-{branch}
 
 environment:
   matrix:
-    - platform: x64
-      generator: "Visual Studio 15 2017 Win64"
-      appveyor_build_worker_image: Visual Studio 2017
-    - platform: x86
-      generator: "Visual Studio 15 2017"
-      appveyor_build_worker_image: Visual Studio 2017
-    - platform: x64
-      generator: "Visual Studio 14 2015 Win64"
-      appveyor_build_worker_image: Visual Studio 2015
-    - platform: x86
-      generator: "Visual Studio 14 2015"
-      appveyor_build_worker_image: Visual Studio 2015
-    - platform: x64
-      generator: "Visual Studio 12 2013 Win64"
+    - job: msvc-vs2013-x86
       appveyor_build_worker_image: Visual Studio 2013
-    - platform: x86
-      generator: "Visual Studio 12 2013"
+      cmake_options: -G "Visual Studio 12 2013"
+
+    - job: msvc-vs2013-x64
       appveyor_build_worker_image: Visual Studio 2013
+      cmake_options: -G "Visual Studio 12 2013 Win64"
+
+    - job: msvc-vs2015-x86
+      appveyor_build_worker_image: Visual Studio 2015
+      cmake_options: -G "Visual Studio 14 2015"
+
+    - job: msvc-vs2015-x64
+      appveyor_build_worker_image: Visual Studio 2015
+      cmake_options: -G "Visual Studio 14 2015 Win64"
+
+    - job: msvc-vs2017-x86
+      appveyor_build_worker_image: Visual Studio 2017
+      cmake_options: -G "Visual Studio 15 2017"
+
+    - job: msvc-vs2017-x64
+      appveyor_build_worker_image: Visual Studio 2017
+      cmake_options: -G "Visual Studio 15 2017 Win64"
+
+    - job: gcc-mingw-x86
+      appveyor_build_worker_image: Visual Studio 2015
+      mingw_path: c:\msys64\mingw32\bin
+      cmake_options: >
+        -G "MinGW Makefiles"
+        -DCMAKE_C_COMPILER=gcc
+        -DCMAKE_CXX_COMPILER=g++
+        -DCMAKE_C_FLAGS=-m32
+        -DCMAKE_CXX_FLAGS=-m32
+
+    - job: gcc-mingw-x64
+      appveyor_build_worker_image: Visual Studio 2015
+      mingw_path: c:\msys64\mingw64\bin
+      cmake_options: >
+        -G "MinGW Makefiles"
+        -DCMAKE_C_COMPILER=gcc
+        -DCMAKE_CXX_COMPILER=g++
+        -DCMAKE_C_FLAGS=-m64
+        -DCMAKE_CXX_FLAGS=-m64
+
+    - job: clang-mingw-x86
+      appveyor_build_worker_image: Visual Studio 2015
+      mingw_path: c:\msys64\mingw32\bin
+      vs_path: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
+      setup_script: vcvarsall.bat x86
+      cmake_options: >
+        -G "MinGW Makefiles"
+        -DCMAKE_C_COMPILER=clang-cl
+        -DCMAKE_CXX_COMPILER=clang-cl
+        -DCMAKE_C_FLAGS=-m32
+        -DCMAKE_CXX_FLAGS=-m32
+
+    - job: clang-mingw-x64
+      appveyor_build_worker_image: Visual Studio 2015
+      mingw_path: c:\msys64\mingw64\bin
+      vs_path: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
+      setup_script: vcvarsall.bat amd64
+      cmake_options: >
+        -G "MinGW Makefiles"
+        -DCMAKE_C_COMPILER=clang-cl
+        -DCMAKE_CXX_COMPILER=clang-cl
+        -DCMAKE_C_FLAGS=-m64
+        -DCMAKE_CXX_FLAGS=-m64
 
 configuration: Debug
 
@@ -32,9 +81,13 @@ init:
 
 install:
   - ps: Install-Product node 'Current'
+  - cmd: set path=%path:C:\Program Files\Git\usr\bin;=%
+  - cmd: set path=%path%;%mingw_path%
+  - cmd: set path=%path%;%vs_path%
+  - cmd: call %setup_script%
 
 before_build:
-  - cmd: cmake . -G "%generator%"
+  - cmd: cmake . %cmake_options%
 
 build_script:
   - cmd: cmake --build . --config "%configuration%" --target wepoll.dll
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1eae4a0..53003b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,7 @@
 cmake_minimum_required(VERSION 2.8.0)
 project(wepoll)
 
-if(WIN32)
-  link_libraries(ws2_32)
-endif()
+link_libraries(ws2_32)
 
 if(MSVC)
   add_compile_options(/Wall /wd4127 /wd4201 /wd4242 /wd4710 /wd4711 /wd4820)