Merge branch 'master' into HEAD

appveyor.yml

@@ -5,14 +5,17 @@ branches:
     - master
     - appveyor_debug
 
-# Operating system (build VM template)
-os: Visual Studio 2015
+image:
+  - Visual Studio 2015
+  # if 2015 works, this should work too
+  - Visual Studio 2017
+  # may or may not work, let's not try
+  #- Visual Studio 2013
 
 # scripts that are called at very beginning, before repo cloning
 init:
   - git config --global core.autocrlf input
 
-
 # clone directory
 clone_folder: c:\projects\stp
 
@@ -22,18 +25,29 @@ platform:
 
 environment:
   global:
-    BOOST_ROOT: C:\Libraries\boost_1_59_0
+    BOOST_ROOT: C:\projects\stp\boost_1_59_0_install
     MINISAT_ROOT: C:\projects\stp\minisat\myinstall
     ZLIB_ROOT: C:\projects\stp\zlib\myinstall
-    MSBUILD_FLAGS: /maxcpucount /nologo
-    PYTHON: "C:\\Python36-x64"
+    PYTHON: "C:\\Python27"
+    PYTHON_ARCH: "x86"
+    PYTHON_VERSION: "2.7.13"
+    BUILD_TYPE: Release
     APPVEYOR_SAVE_CACHE_ON_ERROR: false
   matrix:
   - STATICCOMPILE_SETTING: OFF
     BOOST_OPTIONS:
   - STATICCOMPILE_SETTING: ON
     BOOST_OPTIONS: runtime-link=static  link=static
 
+    # WarningLevel of 1 is ONLY SEVERE warnings, nothing else. See
+    # https://stackoverflow.com/questions/1023858/how-to-suppress-specific-msbuild-warning
+    MSBUILD_FLAGS: /maxcpucount /nologo /property:WarningLevel=1
+  matrix:
+  - STATICCOMPILE_SETTING: OFF
+    BOOST_OPTIONS:
+  - STATICCOMPILE_SETTING: ON
+    BOOST_OPTIONS: runtime-link=static  link=static
+
 install:
     "%PYTHON%\\python.exe -m pip install lit"