From fa8bfc97cf9588f011760d50ab8213bf6ef7a51d Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Tue, 27 Jun 2017 16:50:02 +0100
Subject: [PATCH 01/36] vs: fix uriparser recipe

+ uriparser was requestion whole program optimisation - this lead to
  openframeworks apps to be linked twice - after an initial attempt the
  whole program would have to be linked again.
---
 apothecary/formulas/uriparser/vs2015/uriparser.vcxproj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apothecary/formulas/uriparser/vs2015/uriparser.vcxproj b/apothecary/formulas/uriparser/vs2015/uriparser.vcxproj
index 3e31f0570..9a5779cce 100644
--- a/apothecary/formulas/uriparser/vs2015/uriparser.vcxproj
+++ b/apothecary/formulas/uriparser/vs2015/uriparser.vcxproj
@@ -114,6 +114,7 @@
       <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
     </ClCompile>
     <Lib>
       <OutputFile>..\uriparser.lib</OutputFile>
@@ -128,6 +129,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
     </ClCompile>
     <Lib>
       <OutputFile>..\uriparser.lib</OutputFile>

From c8056ccdb148faed70d3f8db75916bce44b9dd94 Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Tue, 27 Jun 2017 16:51:48 +0100
Subject: [PATCH 02/36] vs2017: apothecary compile, upgrade

+ updates to vs-build function: find location of latest installed MSBuild
  instance through new tool, vswhere.exe.

  vswhere is promised to be installed once at a constant location, and
  should point us to the installation folders of the tools we need.

  MSBuild.exe is used to compile visual studio solutions. It uses a
  slightly different command line than the previous tool, and we need
  to split the build argument into configuration, and platform.

+ updates to vs-upgrade function: find location of latest installed
  devenv through vswhere, as explained above.
---
 apothecary/apothecary | 77 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 69 insertions(+), 8 deletions(-)

diff --git a/apothecary/apothecary b/apothecary/apothecary
index 48702ad75..fe56ffa4f 100755
--- a/apothecary/apothecary
+++ b/apothecary/apothecary
@@ -850,20 +850,81 @@ function gitclone() {
 # example: vs-build "./tess2.sln" Build Debug
 # http://msdn.microsoft.com/library/vstudio/b20w810z.aspx
 function vs-build() {
-	if [ $ARCH == 32 ] ; then
-		cmd.exe /c "call \"%VS${VS_VER}0COMNTOOLS%vsvars32.bat\" && $VS_BUILD_TOOL $1 /${2:-Build} \"${3:-Release}\""
-	elif [ $ARCH == 64 ] ; then
-        cmd.exe /c "call \"%VS${VS_VER}0COMNTOOLS%..\\..\\${VS_64_BIT_ENV}\" amd64 && $VS_BUILD_TOOL $1 /${2:-Build} \"${3:-Release}\""
+
+	if [ $VS_VER -gt 14 ] ; then
+
+		echo "-- Searching for vs-build"
+		# vswhere is a utility to find the most recent vs compiler toolchain. it is 
+		# assumed to be installed at a fixed location
+		VSWHERE_EXE=`cmd.exe /c "echo %ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"`
+		echo "-- Found vswhere: ${VSWHERE_EXE}"
+		# vswhere allows us to query the install dir of the ms build tools
+		VS_INSTALL_PATH=`"${VSWHERE_EXE}" -latest -products Microsoft.VisualStudio.Product.BuildTools -requires Microsoft.Component.MSBuild -property installationPath`
+		echo "-- Found vs install path: ${VS_INSTALL_PATH}"
+		# msbuild is the tool used to build visual studio solutions
+		MSBUILD_PATH="${VS_INSTALL_PATH}\MSBuild\\${VS_VER}.0\Bin\MSBuild.exe"
+		echo "-- Found MSBuild path: ${MSBUILD_PATH}"
+		
+		# Cut part before '|' character of third parameter (which defaults to "Default|x64") and store it as BUILD_CONFIGURATION
+		BUILD_CONFIGURATION="$( cut -d '|' -f 1 <<< "${3:-Default|x64}" )"
+		BUILD_CONFIGURATION=$BUILD_CONFIGURATION
+		# Cut part after '|' character of third parameter (which defaults to "Default|x64") and store it as BUILD_PLATFORM
+		BUILD_PLATFORM="$( cut -d '|' -f 2- <<< "${3:-Default|x64}" )"
+		BUILD_PLATFORM=$BUILD_PLATFORM
+
+		echo "-- Build platform: $BUILD_CONFIGURATION"
+		echo "-- Build configuration: $BUILD_PLATFORM"
+
+		BUILD_EXEC="\"${MSBUILD_PATH}\" $1 /t:${2:-Build} /p:Platform=\"$BUILD_PLATFORM\" /p:Configuration=\"$BUILD_CONFIGURATION\""
+		echo "-- Build parameters: $BUILD_EXEC"
+
+		# we need to add some extra outer quotes, since cmd.exe will only remove the outermost quotes and we might 
+		# have some quotes inside the command.
+		cmd.exe /c "\"$BUILD_EXEC\""
+		
+	else
+		#statements
+		if [ $ARCH == 32 ] ; then
+			cmd.exe /c "call \"%VS${VS_VER}0COMNTOOLS%vsvars32.bat\" && $VS_BUILD_TOOL $1 /${2:-Build} \"${3:-Release}\""
+		elif [ $ARCH == 64 ] ; then
+			echo "call \"%VS${VS_VER}0COMNTOOLS%..\\..\\${VS_64_BIT_ENV}\" amd64 && $VS_BUILD_TOOL $1 /${2:-Build} \"${3:-Release}\""
+	        cmd.exe /c /s "call \"%VS${VS_VER}0COMNTOOLS%..\\..\\${VS_64_BIT_ENV}\" amd64 && $VS_BUILD_TOOL $1 /${2:-Build} \"${3:-Release}\""
+		fi
 	fi
+
 }
 
 # visual studio upgrader
 # http://msdn.microsoft.com/en-us/library/vstudio/w15a82ay(v=vs.110).aspx
 function vs-upgrade() {
-	if [ $ARCH == 32 ] ; then
-		cmd.exe /c "call \"%VS${VS_VER}0COMNTOOLS%vsvars32.bat\" && $VS_BUILD_TOOL $1 /Upgrade"
-	elif [ $ARCH == 64 ] ; then
-		cmd.exe /c "call \"%VS${VS_VER}0COMNTOOLS%..\\..\\${VS_64_BIT_ENV}\" amd64 && $VS_BUILD_TOOL $1 /Upgrade"
+	echo "-- vs-upgrade()"
+
+	if [ $VS_VER -gt 14 ] ; then
+		echo "-- Searching for devenv"
+		# vswhere is a utility to find the most recent vs compiler toolchain. it is 
+		# assumed to be installed at a fixed location
+		VSWHERE_EXE=`cmd.exe /c "echo %ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"`
+		echo "-- Found vswhere: ${VSWHERE_EXE}"
+		# vswhere allows us to query the install dir of the ms build tools
+		VS_IDE_INSTALL_PATH=`"${VSWHERE_EXE}" -latest -products Microsoft.VisualStudio.Product.Community -requires Microsoft.VisualStudio.Component.VC.CoreIde -property installationPath`
+		echo "-- Found vs ide install path: ${VS_IDE_INSTALL_PATH}"
+		# msbuild is the tool used to build visual studio solutions
+		DEVENV_PATH="${VS_IDE_INSTALL_PATH}\Common7\IDE\devenv.exe"
+		echo "-- Found devenv path: ${DEVENV_PATH}"
+		
+		UPGRADE_EXEC="\"${DEVENV_PATH}\" $1 /Upgrade"
+		echo "-- Upgrade parameters: $UPGRADE_EXEC"
+
+		# we need to add some extra outer quotes, since cmd.exe will only remove the outermost quotes and we might 
+		# have some quotes inside the command.
+		cmd.exe /c "\"$UPGRADE_EXEC\""
+		
+	else
+		if [ $ARCH == 32 ] ; then
+			cmd.exe /c "call \"%VS${VS_VER}0COMNTOOLS%vsvars32.bat\" && $VS_BUILD_TOOL $1 /Upgrade"
+		elif [ $ARCH == 64 ] ; then
+			cmd.exe /c "call \"%VS${VS_VER}0COMNTOOLS%..\\..\\${VS_64_BIT_ENV}\" amd64 && $VS_BUILD_TOOL $1 /Upgrade"
+		fi
 	fi
 }
 

From c0eafbda87c95974fc4fdfa666a693e3896f82a6 Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Tue, 27 Jun 2017 16:55:59 +0100
Subject: [PATCH 03/36] set visual studio compiler version to 15

---
 apothecary/apothecary | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apothecary/apothecary b/apothecary/apothecary
index fe56ffa4f..7030229b6 100755
--- a/apothecary/apothecary
+++ b/apothecary/apothecary
@@ -82,7 +82,7 @@ if [ "$(${APOTHECARY_DIR}/ostype.sh)" == "osx" ]; then
 fi
 
 # used when building for vs
-VS_VER=14
+VS_VER=15
 VS_64_BIT_ENV='VC\vcvarsall'
 
 # paths to android SDK, etc

From 4756df50d2c6e8c0caa6b24568ddc8c0ec2c9f0c Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Tue, 27 Jun 2017 16:56:30 +0100
Subject: [PATCH 04/36] upgrade to latest boost, version 1.64.0

+ this version supports visual studio 2017
---
 apothecary/formulas/boost/boost.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apothecary/formulas/boost/boost.sh b/apothecary/formulas/boost/boost.sh
index ea92bd698..16c946f2e 100644
--- a/apothecary/formulas/boost/boost.sh
+++ b/apothecary/formulas/boost/boost.sh
@@ -8,7 +8,7 @@
 FORMULA_TYPES=( "osx" "ios" "tvos" "android" "emscripten" "vs" )
 
 # define the version
-VERSION=1.62.0
+VERSION=1.64.0
 VERSION_UNDERSCORES="$(echo "$VERSION" | sed 's/\./_/g')"
 TARBALL="boost_${VERSION_UNDERSCORES}.tar.gz"
 

From 57edf39303834c0d3edd0acc535e927bc5d3c5f9 Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Tue, 27 Jun 2017 16:57:43 +0100
Subject: [PATCH 05/36] vs2017 : upgrade uriparser recipe

---
 apothecary/formulas/uriparser/uriparser.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apothecary/formulas/uriparser/uriparser.sh b/apothecary/formulas/uriparser/uriparser.sh
index bbf4ac8b3..7ad5a7d79 100644
--- a/apothecary/formulas/uriparser/uriparser.sh
+++ b/apothecary/formulas/uriparser/uriparser.sh
@@ -39,6 +39,11 @@ function build() {
 		unset TMP
 		unset TEMP
 		cd win32/vs2015
+
+		if [[ $VS_VER -gt 14 ]]; then
+			vs-upgrade uriparser.sln
+		fi
+
 		if [ $ARCH == 32 ] ; then
 			vs-build uriparser.sln Build "Release|Win32"
 		elif [ $ARCH == 64 ] ; then

From b84b684d4e4dbe92bd01433ffc322213caefae7b Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Tue, 27 Jun 2017 16:58:49 +0100
Subject: [PATCH 06/36] upgrade curl recipe

---
 apothecary/formulas/curl/curl.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/apothecary/formulas/curl/curl.sh b/apothecary/formulas/curl/curl.sh
index 4782c1e4b..12f29f4a3 100644
--- a/apothecary/formulas/curl/curl.sh
+++ b/apothecary/formulas/curl/curl.sh
@@ -45,11 +45,17 @@ function build() {
 		export OPENSSL_LIBRARIES=$OF_LIBS_OPENSSL_ABS_PATH/lib/
 		PATH=$OPENSSL_LIBRARIES:$PATH cmd //c "projects\\generate.bat vc14"
 		cd projects/Windows/VC14/lib
-		if [ $ARCH == 32 ] ; then
-			PATH=$OPENSSL_LIBRARIES:$PATH vs-build libcurl.sln Build "LIB Release - LIB OpenSSL|Win32"
-		else
-			PATH=$OPENSSL_LIBRARIES:$PATH vs-build libcurl.sln Build "LIB Release - LIB OpenSSL|x64"
-		fi
+
+        # perform upgrade for vs2017, as project file will be for vs 2015
+        if [ $VS_VER -gt 14 ] ; then
+            vs-upgrade libcurl.sln
+        fi
+
+        if [ $ARCH == 32 ] ; then
+            PATH=$OPENSSL_LIBRARIES:$PATH vs-build libcurl.sln Build "LIB Release - LIB OpenSSL|Win32"
+        else
+            PATH=$OPENSSL_LIBRARIES:$PATH vs-build libcurl.sln Build "LIB Release - LIB OpenSSL|x64"
+        fi
 
 	elif [ "$TYPE" == "android" ]; then
 	    local BUILD_TO_DIR=$BUILD_DIR/curl/build/$TYPE/$ABI

From a31c6fb4ae0b7d6f350807b1a8e0c7e552178abc Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Tue, 27 Jun 2017 17:49:15 +0100
Subject: [PATCH 07/36] vs2017: update libxml2

---
 apothecary/formulas/libxml2/libxml2.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apothecary/formulas/libxml2/libxml2.sh b/apothecary/formulas/libxml2/libxml2.sh
index 4ca591926..8e0e6cd48 100644
--- a/apothecary/formulas/libxml2/libxml2.sh
+++ b/apothecary/formulas/libxml2/libxml2.sh
@@ -38,6 +38,9 @@ function build() {
 		unset TMP
 		unset TEMP
 		cd win32/VC10
+
+        vs-upgrade libxml2.vcxproj
+
 		if [ $ARCH == 32 ] ; then
 			vs-build libxml2.vcxproj Build "Release|Win32"
 		else

From 2e2b584f3c06200152e5af6147e542c35aa1004c Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Tue, 27 Jun 2017 17:49:32 +0100
Subject: [PATCH 08/36] vs2017: update freetype

---
 apothecary/formulas/freetype/freetype.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apothecary/formulas/freetype/freetype.sh b/apothecary/formulas/freetype/freetype.sh
index 50f3532c7..1f379b433 100644
--- a/apothecary/formulas/freetype/freetype.sh
+++ b/apothecary/formulas/freetype/freetype.sh
@@ -89,7 +89,9 @@ function build() {
 		unset TEMP
 		unset temp
 		cd builds/windows/vc2010 #this upgrades without issue to vs2015
-		vs-upgrade "freetype.sln"
+		
+		vs-upgrade freetype.sln
+
 		if [ "$ARCH" ==  "32" ] ; then
 			vs-build freetype.sln Build "Release|Win32"
 		elif [ "$ARCH" == "64" ] ; then

From bb3c9c04387a358b548eb185a411e01a745b0c00 Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Tue, 27 Jun 2017 17:49:50 +0100
Subject: [PATCH 09/36] vs2017: update libpng

---
 apothecary/formulas/libpng/libpng.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apothecary/formulas/libpng/libpng.sh b/apothecary/formulas/libpng/libpng.sh
index cf0973372..320540dff 100644
--- a/apothecary/formulas/libpng/libpng.sh
+++ b/apothecary/formulas/libpng/libpng.sh
@@ -56,6 +56,9 @@ function build() {
 		unset TMP
 		unset TEMP
 		cd projects/vs2015
+
+		vs-upgrade libpng.sln
+
 		if [ $ARCH == 32 ] ; then
 			vs-build libpng.sln Build "LIB Release|x86"
 		elif [ $ARCH == 64 ] ; then

From b8cbf9db481ccda08b9828870939b278d10ad13e Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Wed, 28 Jun 2017 10:56:33 +0100
Subject: [PATCH 10/36] update appveyor provision

+ add visual studio 2017 build instance
---
 .appveyor.yml | 40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index cb5fe804e..bebf06b1d 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,24 +1,35 @@
-version: 1.0.{build}
-os: Visual Studio 2015 RC
+version: 2.0.{build}
 
 environment:
   global:
     APPVEYOR_OS_NAME: windows
     CHERE_INVOKING: 1
   matrix:
+  #VisualStudio 2017 Building
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      platform: x64
+      TARGET: vs
+      VS_VER: 15
+      ARCH: 64
   #MSYS2 Building
-    - platform: x86
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      platform: x86
       TARGET: msys2
       ARCH: 32
-
-  #VisualStudio Building
-    - platform: x86
+  #VisualStudio 2015 32 bit Building
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      platform: x86
+      VS_VER: 14
       TARGET: vs
       ARCH: 32
-    - platform: x64
+  #VisualStudio 2015 64 bit Building
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      platform: x64
+      VS_VER: 14
       TARGET: vs
       ARCH: 64
 
+
 configuration: Debug
 shallow_clone: true
 clone_depth: 10
@@ -26,15 +37,18 @@ clone_depth: 10
 init:
 - set MSYS2_PATH=c:\msys64
 - set PATH=%MSYS2_PATH%\usr\bin;%PATH%
-#- '%MSYS2_PATH%\usr\bin\bash -lc "pacman --noconfirm -Sy pacman"'
-#- '%MSYS2_PATH%\usr\bin\bash -lc "pacman --noconfirm -Syu"'
-#- '%MSYS2_PATH%\usr\bin\bash -lc "pacman --noconfirm -Su"'
 - '%MSYS2_PATH%\usr\bin\bash -lc "pacman --noconfirm -S unzip dos2unix gperf mingw-w64-i686-libxml2"'
 - if "%TARGET%_%PLATFORM%"=="msys2_x86" set MSYSTEM=MINGW32
 - if "%TARGET%_%PLATFORM%"=="msys2_x64" set MSYSTEM=MINGW64
-- if "%PLATFORM%"=="x86" call "%VS140COMNTOOLS%\vsvars32.bat"
-- if "%PLATFORM%"=="x64" call "%VS140COMNTOOLS%..\..\VC\vcvarsall" amd64
-- if "%TARGET%"=="vs" set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin;%PATH%
+# visual studio 2015
+- if "%PLATFORM%_%VS_VER%"=="x86_14" call "%VS140COMNTOOLS%\vsvars32.bat"
+- if "%PLATFORM%_%VS_VER%"=="x64_14" call "%VS140COMNTOOLS%..\..\VC\vcvarsall" amd64
+- if "%TARGET%_%VS_VER%"=="vs_14" set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin;%PATH%
+# visual studio 2017
+# - if "%PLATFORM%_%VS_VER%"=="x86_15" call %comspec% /k "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
+- if "%PLATFORM%_%VS_VER%"=="x64_15" call %comspec% /k "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+- if "%TARGET%_%VS_VER%"=="vs_15" set PATH=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.10.25017\bin\HostX64\x64;%PATH%
+
 
 build_script:
 - '%MSYS2_PATH%\usr\bin\bash -lc "scripts/build.sh"'

From 4ab6dcda17353c3a5a9b00d28f0d256a93491d79 Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Wed, 28 Jun 2017 11:05:28 +0100
Subject: [PATCH 11/36] tweak appveyor scriptwq

---
 .appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index bebf06b1d..171f28e5c 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -45,8 +45,8 @@ init:
 - if "%PLATFORM%_%VS_VER%"=="x64_14" call "%VS140COMNTOOLS%..\..\VC\vcvarsall" amd64
 - if "%TARGET%_%VS_VER%"=="vs_14" set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin;%PATH%
 # visual studio 2017
-# - if "%PLATFORM%_%VS_VER%"=="x86_15" call %comspec% /k "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
-- if "%PLATFORM%_%VS_VER%"=="x64_15" call %comspec% /k "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+# - if "%PLATFORM%_%VS_VER%"=="x86_15" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
+- if "%PLATFORM%_%VS_VER%"=="x64_15" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
 - if "%TARGET%_%VS_VER%"=="vs_15" set PATH=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.10.25017\bin\HostX64\x64;%PATH%
 
 

From 9456aef91ede1cd9cce78873bd50212b7dade577 Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Wed, 28 Jun 2017 11:07:57 +0100
Subject: [PATCH 12/36] tweak appveyor script: remove other builds from matrix
 for now

---
 .appveyor.yml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 171f28e5c..9749c643c 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -12,22 +12,22 @@ environment:
       VS_VER: 15
       ARCH: 64
   #MSYS2 Building
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      platform: x86
-      TARGET: msys2
-      ARCH: 32
-  #VisualStudio 2015 32 bit Building
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      platform: x86
-      VS_VER: 14
-      TARGET: vs
-      ARCH: 32
-  #VisualStudio 2015 64 bit Building
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      platform: x64
-      VS_VER: 14
-      TARGET: vs
-      ARCH: 64
+  #   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+  #     platform: x86
+  #     TARGET: msys2
+  #     ARCH: 32
+  # #VisualStudio 2015 32 bit Building
+  #   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+  #     platform: x86
+  #     VS_VER: 14
+  #     TARGET: vs
+  #     ARCH: 32
+  # #VisualStudio 2015 64 bit Building
+  #   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+  #     platform: x64
+  #     VS_VER: 14
+  #     TARGET: vs
+  #     ARCH: 64
 
 
 configuration: Debug

From 771b9af87b457b75e68153253d0255be1a7fa883 Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Wed, 28 Jun 2017 11:21:17 +0100
Subject: [PATCH 13/36] change way of finding msbuild

---
 apothecary/apothecary | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apothecary/apothecary b/apothecary/apothecary
index 7030229b6..428b0b7cf 100755
--- a/apothecary/apothecary
+++ b/apothecary/apothecary
@@ -859,7 +859,7 @@ function vs-build() {
 		VSWHERE_EXE=`cmd.exe /c "echo %ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"`
 		echo "-- Found vswhere: ${VSWHERE_EXE}"
 		# vswhere allows us to query the install dir of the ms build tools
-		VS_INSTALL_PATH=`"${VSWHERE_EXE}" -latest -products Microsoft.VisualStudio.Product.BuildTools -requires Microsoft.Component.MSBuild -property installationPath`
+		VS_INSTALL_PATH=`cmd.exe /c "${VSWHERE_EXE}" -latest -products Microsoft.VisualStudio.Product.Community -requires Microsoft.VisualStudio.Component.VC.CoreIde -property installationPath`
 		echo "-- Found vs install path: ${VS_INSTALL_PATH}"
 		# msbuild is the tool used to build visual studio solutions
 		MSBUILD_PATH="${VS_INSTALL_PATH}\MSBuild\\${VS_VER}.0\Bin\MSBuild.exe"
@@ -906,7 +906,7 @@ function vs-upgrade() {
 		VSWHERE_EXE=`cmd.exe /c "echo %ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"`
 		echo "-- Found vswhere: ${VSWHERE_EXE}"
 		# vswhere allows us to query the install dir of the ms build tools
-		VS_IDE_INSTALL_PATH=`"${VSWHERE_EXE}" -latest -products Microsoft.VisualStudio.Product.Community -requires Microsoft.VisualStudio.Component.VC.CoreIde -property installationPath`
+		VS_IDE_INSTALL_PATH=`cmd.exe /c "${VSWHERE_EXE}" -latest -products Microsoft.VisualStudio.Product.Community -requires Microsoft.VisualStudio.Component.VC.CoreIde -property installationPath`
 		echo "-- Found vs ide install path: ${VS_IDE_INSTALL_PATH}"
 		# msbuild is the tool used to build visual studio solutions
 		DEVENV_PATH="${VS_IDE_INSTALL_PATH}\Common7\IDE\devenv.exe"

From 5bbaddcfe56b3ee85a5b1f4dca39745de2db7569 Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Wed, 28 Jun 2017 11:55:22 +0100
Subject: [PATCH 14/36] update vswhere location

---
 apothecary/apothecary | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apothecary/apothecary b/apothecary/apothecary
index 428b0b7cf..474c1db2b 100755
--- a/apothecary/apothecary
+++ b/apothecary/apothecary
@@ -856,10 +856,10 @@ function vs-build() {
 		echo "-- Searching for vs-build"
 		# vswhere is a utility to find the most recent vs compiler toolchain. it is 
 		# assumed to be installed at a fixed location
-		VSWHERE_EXE=`cmd.exe /c "echo %ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"`
+		VSWHERE_EXE=`cmd.exe //c "echo %ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" `
 		echo "-- Found vswhere: ${VSWHERE_EXE}"
 		# vswhere allows us to query the install dir of the ms build tools
-		VS_INSTALL_PATH=`cmd.exe /c "${VSWHERE_EXE}" -latest -products Microsoft.VisualStudio.Product.Community -requires Microsoft.VisualStudio.Component.VC.CoreIde -property installationPath`
+		VS_INSTALL_PATH=`cmd //c ${VSWHERE_EXE} -latest -products Microsoft.VisualStudio.Product.Community -requires Microsoft.VisualStudio.Component.VC.CoreIde -property installationPath`
 		echo "-- Found vs install path: ${VS_INSTALL_PATH}"
 		# msbuild is the tool used to build visual studio solutions
 		MSBUILD_PATH="${VS_INSTALL_PATH}\MSBuild\\${VS_VER}.0\Bin\MSBuild.exe"
@@ -903,10 +903,10 @@ function vs-upgrade() {
 		echo "-- Searching for devenv"
 		# vswhere is a utility to find the most recent vs compiler toolchain. it is 
 		# assumed to be installed at a fixed location
-		VSWHERE_EXE=`cmd.exe /c "echo %ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"`
+		VSWHERE_EXE=`cmd.exe //c "echo %ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" `
 		echo "-- Found vswhere: ${VSWHERE_EXE}"
 		# vswhere allows us to query the install dir of the ms build tools
-		VS_IDE_INSTALL_PATH=`cmd.exe /c "${VSWHERE_EXE}" -latest -products Microsoft.VisualStudio.Product.Community -requires Microsoft.VisualStudio.Component.VC.CoreIde -property installationPath`
+		VS_IDE_INSTALL_PATH=`cmd.exe //c "${VSWHERE_EXE}" -latest -products Microsoft.VisualStudio.Product.Community -requires Microsoft.VisualStudio.Component.VC.CoreIde -property installationPath`
 		echo "-- Found vs ide install path: ${VS_IDE_INSTALL_PATH}"
 		# msbuild is the tool used to build visual studio solutions
 		DEVENV_PATH="${VS_IDE_INSTALL_PATH}\Common7\IDE\devenv.exe"

From 3983a35c4b6331933dd34b9465bd3a25f1c1ce84 Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Wed, 28 Jun 2017 15:12:20 +0100
Subject: [PATCH 15/36] dipping a toe into escape character substitution hell

---
 apothecary/apothecary | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/apothecary/apothecary b/apothecary/apothecary
index 474c1db2b..06cfeaf3d 100755
--- a/apothecary/apothecary
+++ b/apothecary/apothecary
@@ -856,10 +856,10 @@ function vs-build() {
 		echo "-- Searching for vs-build"
 		# vswhere is a utility to find the most recent vs compiler toolchain. it is 
 		# assumed to be installed at a fixed location
-		VSWHERE_EXE=`cmd.exe //c "echo %ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" `
+		VSWHERE_EXE=`cmd.exe //c "echo %ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"`
 		echo "-- Found vswhere: ${VSWHERE_EXE}"
 		# vswhere allows us to query the install dir of the ms build tools
-		VS_INSTALL_PATH=`cmd //c ${VSWHERE_EXE} -latest -products Microsoft.VisualStudio.Product.Community -requires Microsoft.VisualStudio.Component.VC.CoreIde -property installationPath`
+		VS_INSTALL_PATH=`cmd //c "${VSWHERE_EXE}" -latest -products Microsoft.VisualStudio.Product.Community -requires Microsoft.VisualStudio.Component.VC.CoreIde -property installationPath`
 		echo "-- Found vs install path: ${VS_INSTALL_PATH}"
 		# msbuild is the tool used to build visual studio solutions
 		MSBUILD_PATH="${VS_INSTALL_PATH}\MSBuild\\${VS_VER}.0\Bin\MSBuild.exe"
@@ -875,7 +875,7 @@ function vs-build() {
 		echo "-- Build platform: $BUILD_CONFIGURATION"
 		echo "-- Build configuration: $BUILD_PLATFORM"
 
-		BUILD_EXEC="\"${MSBUILD_PATH}\" $1 /t:${2:-Build} /p:Platform=\"$BUILD_PLATFORM\" /p:Configuration=\"$BUILD_CONFIGURATION\""
+		BUILD_EXEC="\"${MSBUILD_PATH}\" \"$1\" /t:${2:-Build} /p:Platform=\"$BUILD_PLATFORM\" /p:Configuration=\"$BUILD_CONFIGURATION\""
 		echo "-- Build parameters: $BUILD_EXEC"
 
 		# we need to add some extra outer quotes, since cmd.exe will only remove the outermost quotes and we might 
@@ -885,10 +885,10 @@ function vs-build() {
 	else
 		#statements
 		if [ $ARCH == 32 ] ; then
-			cmd.exe /c "call \"%VS${VS_VER}0COMNTOOLS%vsvars32.bat\" && $VS_BUILD_TOOL $1 /${2:-Build} \"${3:-Release}\""
+			cmd.exe //c "call \"%VS${VS_VER}0COMNTOOLS%vsvars32.bat\" && $VS_BUILD_TOOL $1 /${2:-Build} \"${3:-Release}\""
 		elif [ $ARCH == 64 ] ; then
 			echo "call \"%VS${VS_VER}0COMNTOOLS%..\\..\\${VS_64_BIT_ENV}\" amd64 && $VS_BUILD_TOOL $1 /${2:-Build} \"${3:-Release}\""
-	        cmd.exe /c /s "call \"%VS${VS_VER}0COMNTOOLS%..\\..\\${VS_64_BIT_ENV}\" amd64 && $VS_BUILD_TOOL $1 /${2:-Build} \"${3:-Release}\""
+	        cmd.exe //c /s "call \"%VS${VS_VER}0COMNTOOLS%..\\..\\${VS_64_BIT_ENV}\" amd64 && $VS_BUILD_TOOL $1 /${2:-Build} \"${3:-Release}\""
 		fi
 	fi
 
@@ -903,10 +903,10 @@ function vs-upgrade() {
 		echo "-- Searching for devenv"
 		# vswhere is a utility to find the most recent vs compiler toolchain. it is 
 		# assumed to be installed at a fixed location
-		VSWHERE_EXE=`cmd.exe //c "echo %ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" `
+		VSWHERE_EXE=`cmd.exe //c "echo %ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"`
 		echo "-- Found vswhere: ${VSWHERE_EXE}"
 		# vswhere allows us to query the install dir of the ms build tools
-		VS_IDE_INSTALL_PATH=`cmd.exe //c "${VSWHERE_EXE}" -latest -products Microsoft.VisualStudio.Product.Community -requires Microsoft.VisualStudio.Component.VC.CoreIde -property installationPath`
+		VS_IDE_INSTALL_PATH=`cmd //c "${VSWHERE_EXE}" -latest -products Microsoft.VisualStudio.Product.Community -requires Microsoft.VisualStudio.Component.VC.CoreIde -property installationPath`
 		echo "-- Found vs ide install path: ${VS_IDE_INSTALL_PATH}"
 		# msbuild is the tool used to build visual studio solutions
 		DEVENV_PATH="${VS_IDE_INSTALL_PATH}\Common7\IDE\devenv.exe"

From 2a8bed2acd80e4bae81db5fdadb0c30d5e08fc41 Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Wed, 28 Jun 2017 16:07:31 +0100
Subject: [PATCH 16/36] fix poco formula for vs2017

---
 apothecary/formulas/poco/buildwin.cmd |  7 ++++++-
 apothecary/formulas/poco/poco.sh      | 21 +++++++++++++++------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/apothecary/formulas/poco/buildwin.cmd b/apothecary/formulas/poco/buildwin.cmd
index b0dc084b0..add3f9748 100644
--- a/apothecary/formulas/poco/buildwin.cmd
+++ b/apothecary/formulas/poco/buildwin.cmd
@@ -122,6 +122,7 @@ if %VS_VERSION%==vs100 (set VCPROJ_EXT=vcxproj)
 if %VS_VERSION%==vs110 (set VCPROJ_EXT=vcxproj)
 if %VS_VERSION%==vs120 (set VCPROJ_EXT=vcxproj)
 if %VS_VERSION%==vs140 (set VCPROJ_EXT=vcxproj)
+if %VS_VERSION%==vs150 (set VCPROJ_EXT=vcxproj)
 
 if "%8"=="" goto use_devenv
 set BUILD_TOOL=%8
@@ -132,6 +133,8 @@ if "%VS_VERSION%"=="vs100" (set BUILD_TOOL=msbuild)
 if "%VS_VERSION%"=="vs110" (set BUILD_TOOL=msbuild)
 if "%VS_VERSION%"=="vs120" (set BUILD_TOOL=msbuild)
 if "%VS_VERSION%"=="vs140" (set BUILD_TOOL=msbuild)
+if "%VS_VERSION%"=="vs150" (set BUILD_TOOL=msbuild)
+
 :use_custom
 if not "%BUILD_TOOL%"=="msbuild" (set USEENV=/useenv)
 if "%BUILD_TOOL%"=="msbuild" (
@@ -147,6 +150,7 @@ if "%VS_VERSION%"=="vs100" (goto msbuildok)
 if "%VS_VERSION%"=="vs110" (goto msbuildok)
 if "%VS_VERSION%"=="vs120" (goto msbuildok)
 if "%VS_VERSION%"=="vs140" (goto msbuildok)
+if "%VS_VERSION%"=="vs150" (goto msbuildok)
 if "%BUILD_TOOL%"=="msbuild" (
   echo "Cannot use msbuild with Visual Studio 2008 or earlier."
   exit /b 2
@@ -191,6 +195,7 @@ set USEENV=
 if %VS_VERSION%==vs110 (set EXTRASW=/m /p:VisualStudioVersion=11.0)
 if %VS_VERSION%==vs120 (set EXTRASW=/m /p:VisualStudioVersion=12.0)
 if %VS_VERSION%==vs140 (set EXTRASW=/m /p:VisualStudioVersion=14.0)
+if %VS_VERSION%==vs150 (set EXTRASW=/m /p:VisualStudioVersion=15.0)
 )
 
 rem SAMPLES [samples|nosamples]
@@ -597,7 +602,7 @@ exit /b 1
 echo Usage:
 echo ------
 echo buildwin VS_VERSION [ACTION] [LINKMODE] [CONFIGURATION] [PLATFORM] [SAMPLES] [TESTS] [TOOL]
-echo VS_VERSION:    "90|100|110|120|140"
+echo VS_VERSION:    "90|100|110|120|140|150"
 echo ACTION:        "build|rebuild|clean|upgrade"
 echo LINKMODE:      "static_mt|static_md|shared|all"
 echo CONFIGURATION: "release|debug|both"
diff --git a/apothecary/formulas/poco/poco.sh b/apothecary/formulas/poco/poco.sh
index 8b9d66e70..903f0b930 100644
--- a/apothecary/formulas/poco/poco.sh
+++ b/apothecary/formulas/poco/poco.sh
@@ -166,13 +166,22 @@ function build() {
 	elif [ "$TYPE" == "vs" ] ; then
 		unset TMP
 		unset TEMP
-		if [ $ARCH == 32 ] ; then
-			cmd.exe /c "call \"%VS${VS_VER}0COMNTOOLS%vsvars32.bat\" && buildwin.cmd ${VS_VER}0 upgrade static_md both Win32 nosamples notests"
-			cmd.exe /c "call \"%VS${VS_VER}0COMNTOOLS%vsvars32.bat\" && buildwin.cmd ${VS_VER}0 build static_md both Win32 nosamples notests"
-		elif [ $ARCH == 64 ] ; then
-			cmd.exe /c "call \"%VS${VS_VER}0COMNTOOLS%..\\..\\${VS_64_BIT_ENV}\" amd64 && buildwin.cmd ${VS_VER}0 upgrade static_md both x64 nosamples notests"
-			cmd.exe /c "call \"%VS${VS_VER}0COMNTOOLS%..\\..\\${VS_64_BIT_ENV}\" amd64 && buildwin.cmd ${VS_VER}0 build static_md both x64 nosamples notests"
+
+		if [[ $VS_VER -gt 14 ]]; then
+
+			cmd.exe /c "call \"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat\" && buildwin.cmd ${VS_VER}0 upgrade static_md both Win32 nosamples notests"			
+			cmd.exe /c "call \"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat\" && buildwin.cmd ${VS_VER}0 build static_md both Win32 nosamples notests"
+			else 
+
+			if [ $ARCH == 32 ] ; then
+				cmd.exe /c "call \"%VS${VS_VER}0COMNTOOLS%vsvars32.bat\" && buildwin.cmd ${VS_VER}0 upgrade static_md both Win32 nosamples notests"
+				cmd.exe /c "call \"%VS${VS_VER}0COMNTOOLS%vsvars32.bat\" && buildwin.cmd ${VS_VER}0 build static_md both Win32 nosamples notests"
+			elif [ $ARCH == 64 ] ; then
+				cmd.exe /c "call \"%VS${VS_VER}0COMNTOOLS%..\\..\\${VS_64_BIT_ENV}\" amd64 && buildwin.cmd ${VS_VER}0 upgrade static_md both x64 nosamples notests"
+				cmd.exe /c "call \"%VS${VS_VER}0COMNTOOLS%..\\..\\${VS_64_BIT_ENV}\" amd64 && buildwin.cmd ${VS_VER}0 build static_md both x64 nosamples notests"
+			fi
 		fi
+
 	elif [ "$TYPE" == "msys2" ] ; then
 	    cp $FORMULA_DIR/MinGWConfig64 build/config/MinGW
 

From d94a365793712b5624297b8df6173912a73cf8df Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Wed, 28 Jun 2017 16:12:18 +0100
Subject: [PATCH 17/36] fix lib type error in poco formula

---
 apothecary/formulas/poco/poco.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apothecary/formulas/poco/poco.sh b/apothecary/formulas/poco/poco.sh
index 903f0b930..18d681050 100644
--- a/apothecary/formulas/poco/poco.sh
+++ b/apothecary/formulas/poco/poco.sh
@@ -169,8 +169,8 @@ function build() {
 
 		if [[ $VS_VER -gt 14 ]]; then
 
-			cmd.exe /c "call \"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat\" && buildwin.cmd ${VS_VER}0 upgrade static_md both Win32 nosamples notests"			
-			cmd.exe /c "call \"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat\" && buildwin.cmd ${VS_VER}0 build static_md both Win32 nosamples notests"
+			cmd.exe /c "call \"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat\" && buildwin.cmd ${VS_VER}0 upgrade static_md both x64 nosamples notests"			
+			cmd.exe /c "call \"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat\" && buildwin.cmd ${VS_VER}0 build static_md both x64 nosamples notests"
 			else 
 
 			if [ $ARCH == 32 ] ; then

From ad14634ae8ed476ec9f11d6aed44846f6c52f0a1 Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Wed, 28 Jun 2017 17:21:25 +0100
Subject: [PATCH 18/36] vs2017: add 32 bit image back in

---
 .appveyor.yml                    | 44 ++++++++++++++++++--------------
 apothecary/formulas/poco/poco.sh | 24 ++++++++++-------
 2 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 9749c643c..9422d44ac 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -5,29 +5,35 @@ environment:
     APPVEYOR_OS_NAME: windows
     CHERE_INVOKING: 1
   matrix:
-  #VisualStudio 2017 Building
+  # #VisualStudio 2017 64 bit Building
+  #   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+  #     platform: x64
+  #     TARGET: vs
+  #     VS_VER: 15
+  #     ARCH: 64
+  #VisualStudio 2017 32 bit Building
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       platform: x64
       TARGET: vs
       VS_VER: 15
+      ARCH: 32
+  # MSYS2 Building
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      platform: x86
+      TARGET: msys2
+      ARCH: 32
+  #VisualStudio 2015 32 bit Building
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      platform: x86
+      VS_VER: 14
+      TARGET: vs
+      ARCH: 32
+  #VisualStudio 2015 64 bit Building
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      platform: x64
+      VS_VER: 14
+      TARGET: vs
       ARCH: 64
-  #MSYS2 Building
-  #   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-  #     platform: x86
-  #     TARGET: msys2
-  #     ARCH: 32
-  # #VisualStudio 2015 32 bit Building
-  #   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-  #     platform: x86
-  #     VS_VER: 14
-  #     TARGET: vs
-  #     ARCH: 32
-  # #VisualStudio 2015 64 bit Building
-  #   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-  #     platform: x64
-  #     VS_VER: 14
-  #     TARGET: vs
-  #     ARCH: 64
 
 
 configuration: Debug
@@ -45,7 +51,7 @@ init:
 - if "%PLATFORM%_%VS_VER%"=="x64_14" call "%VS140COMNTOOLS%..\..\VC\vcvarsall" amd64
 - if "%TARGET%_%VS_VER%"=="vs_14" set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin;%PATH%
 # visual studio 2017
-# - if "%PLATFORM%_%VS_VER%"=="x86_15" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
+- if "%PLATFORM%_%VS_VER%"=="x86_15" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
 - if "%PLATFORM%_%VS_VER%"=="x64_15" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
 - if "%TARGET%_%VS_VER%"=="vs_15" set PATH=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.10.25017\bin\HostX64\x64;%PATH%
 
diff --git a/apothecary/formulas/poco/poco.sh b/apothecary/formulas/poco/poco.sh
index 18d681050..dd79ba6a6 100644
--- a/apothecary/formulas/poco/poco.sh
+++ b/apothecary/formulas/poco/poco.sh
@@ -169,17 +169,23 @@ function build() {
 
 		if [[ $VS_VER -gt 14 ]]; then
 
-			cmd.exe /c "call \"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat\" && buildwin.cmd ${VS_VER}0 upgrade static_md both x64 nosamples notests"			
-			cmd.exe /c "call \"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat\" && buildwin.cmd ${VS_VER}0 build static_md both x64 nosamples notests"
+				if [ $ARCH == 32 ] ; then
+					cmd.exe /c "call \"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat\" && buildwin.cmd ${VS_VER}0 upgrade static_md both Win32 nosamples notests"			
+					cmd.exe /c "call \"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat\" && buildwin.cmd ${VS_VER}0 build static_md both Win32 nosamples notests"
+				elif [ $ARCH == 64 ] ; then
+					cmd.exe /c "call \"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat\" && buildwin.cmd ${VS_VER}0 upgrade static_md both x64 nosamples notests"			
+					cmd.exe /c "call \"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat\" && buildwin.cmd ${VS_VER}0 build static_md both x64 nosamples notests"
+				fi
+
 			else 
 
-			if [ $ARCH == 32 ] ; then
-				cmd.exe /c "call \"%VS${VS_VER}0COMNTOOLS%vsvars32.bat\" && buildwin.cmd ${VS_VER}0 upgrade static_md both Win32 nosamples notests"
-				cmd.exe /c "call \"%VS${VS_VER}0COMNTOOLS%vsvars32.bat\" && buildwin.cmd ${VS_VER}0 build static_md both Win32 nosamples notests"
-			elif [ $ARCH == 64 ] ; then
-				cmd.exe /c "call \"%VS${VS_VER}0COMNTOOLS%..\\..\\${VS_64_BIT_ENV}\" amd64 && buildwin.cmd ${VS_VER}0 upgrade static_md both x64 nosamples notests"
-				cmd.exe /c "call \"%VS${VS_VER}0COMNTOOLS%..\\..\\${VS_64_BIT_ENV}\" amd64 && buildwin.cmd ${VS_VER}0 build static_md both x64 nosamples notests"
-			fi
+				if [ $ARCH == 32 ] ; then
+					cmd.exe /c "call \"%VS${VS_VER}0COMNTOOLS%vsvars32.bat\" && buildwin.cmd ${VS_VER}0 upgrade static_md both Win32 nosamples notests"
+					cmd.exe /c "call \"%VS${VS_VER}0COMNTOOLS%vsvars32.bat\" && buildwin.cmd ${VS_VER}0 build static_md both Win32 nosamples notests"
+				elif [ $ARCH == 64 ] ; then
+					cmd.exe /c "call \"%VS${VS_VER}0COMNTOOLS%..\\..\\${VS_64_BIT_ENV}\" amd64 && buildwin.cmd ${VS_VER}0 upgrade static_md both x64 nosamples notests"
+					cmd.exe /c "call \"%VS${VS_VER}0COMNTOOLS%..\\..\\${VS_64_BIT_ENV}\" amd64 && buildwin.cmd ${VS_VER}0 build static_md both x64 nosamples notests"
+				fi
 		fi
 
 	elif [ "$TYPE" == "msys2" ] ; then

From 63dfb212b822304144f6d925ca274b85df9d5a9f Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Wed, 28 Jun 2017 17:23:29 +0100
Subject: [PATCH 19/36] fix platform for 32 bit build

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 9422d44ac..56fea586d 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -13,7 +13,7 @@ environment:
   #     ARCH: 64
   #VisualStudio 2017 32 bit Building
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      platform: x64
+      platform: x86
       TARGET: vs
       VS_VER: 15
       ARCH: 32

From e6cf713c5f0cbc632de03445d8da25d2aad6f954 Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Wed, 28 Jun 2017 17:48:44 +0100
Subject: [PATCH 20/36] add suffix to zipfile based on vs version

---
 .appveyor.yml    | 32 ++++++++++++++++++--------------
 scripts/build.sh |  2 +-
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 56fea586d..34215ce7e 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -5,36 +5,40 @@ environment:
     APPVEYOR_OS_NAME: windows
     CHERE_INVOKING: 1
   matrix:
-  # #VisualStudio 2017 64 bit Building
+  # # VisualStudio 2017 64 bit Building
   #   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
   #     platform: x64
   #     TARGET: vs
   #     VS_VER: 15
   #     ARCH: 64
-  #VisualStudio 2017 32 bit Building
+  #     VS_NAME: vs2017
+  # VisualStudio 2017 32 bit Building
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       platform: x86
       TARGET: vs
       VS_VER: 15
       ARCH: 32
-  # MSYS2 Building
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      platform: x86
-      TARGET: msys2
-      ARCH: 32
+      VS_NAME: vs2017
+  # # MSYS2 Building
+  #   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+  #     platform: x86
+  #     TARGET: msys2
+  #     ARCH: 32
+  #     VS_NAME: 
   #VisualStudio 2015 32 bit Building
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       platform: x86
       VS_VER: 14
       TARGET: vs
       ARCH: 32
-  #VisualStudio 2015 64 bit Building
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      platform: x64
-      VS_VER: 14
-      TARGET: vs
-      ARCH: 64
-
+      VS_NAME: vs2015
+  # #VisualStudio 2015 64 bit Building
+  #   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+  #     platform: x64
+  #     VS_VER: 14
+  #     TARGET: vs
+  #     ARCH: 64
+  #     VS_NAME: vs2015
 
 configuration: Debug
 shallow_clone: true
diff --git a/scripts/build.sh b/scripts/build.sh
index 78cae5518..7aaf41dfe 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -153,7 +153,7 @@ cd $ROOT
 echo "Compressing libraries from $PWD"
 LIBS=$(ls | grep -v \.appveyor.yml | grep -v \.travis.yml | grep -v \.gitignore | grep -v apothecary | grep -v scripts)
 if [ ! -z ${APPVEYOR+x} ]; then
-	TARBALL=openFrameworksLibs_${APPVEYOR_REPO_BRANCH}_${TARGET}${ARCH}.zip
+	TARBALL=openFrameworksLibs_${APPVEYOR_REPO_BRANCH}_${TARGET}_${VS_NAME}${ARCH}.zip
 	7z a $TARBALL $LIBS
 else
 	TARBALL=openFrameworksLibs_${TRAVIS_BRANCH}_$TARGET$OPT$OPT2.tar.bz2

From 17edc4dcb353b35da9d694ef4d25af91316f6b68 Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Wed, 28 Jun 2017 17:49:06 +0100
Subject: [PATCH 21/36] fix flipped log message

---
 apothecary/apothecary | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apothecary/apothecary b/apothecary/apothecary
index 06cfeaf3d..834559692 100755
--- a/apothecary/apothecary
+++ b/apothecary/apothecary
@@ -872,8 +872,8 @@ function vs-build() {
 		BUILD_PLATFORM="$( cut -d '|' -f 2- <<< "${3:-Default|x64}" )"
 		BUILD_PLATFORM=$BUILD_PLATFORM
 
-		echo "-- Build platform: $BUILD_CONFIGURATION"
-		echo "-- Build configuration: $BUILD_PLATFORM"
+		echo "-- Build platform: $BUILD_PLATFORM"
+		echo "-- Build configuration: $BUILD_CONFIGURATION"
 
 		BUILD_EXEC="\"${MSBUILD_PATH}\" \"$1\" /t:${2:-Build} /p:Platform=\"$BUILD_PLATFORM\" /p:Configuration=\"$BUILD_CONFIGURATION\""
 		echo "-- Build parameters: $BUILD_EXEC"

From 24b37fcdfe8e5d44e7d61d627f909f3be1b37908 Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Wed, 28 Jun 2017 17:49:33 +0100
Subject: [PATCH 22/36] attempt salvaging zlib build script

---
 apothecary/formulas/_depends/zlib.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apothecary/formulas/_depends/zlib.sh b/apothecary/formulas/_depends/zlib.sh
index 1ed22a2b4..0033a487d 100644
--- a/apothecary/formulas/_depends/zlib.sh
+++ b/apothecary/formulas/_depends/zlib.sh
@@ -30,7 +30,7 @@ function build() {
 		unset TEMP
 		if [ $ARCH == 32 ] ; then
 			cmake -G "Visual Studio $VS_VER"
-			vs-build "zlib.sln"
+			vs-build "zlib.sln" Build "Release|Win32"
 		elif [ $ARCH == 64 ] ; then
 			cmake -G "Visual Studio $VS_VER Win64"
 			vs-build "zlib.sln" Build "Release|x64"

From f7fa20f14ee26625fbbf2a9514fd6b20b694f7fc Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Wed, 28 Jun 2017 17:57:10 +0100
Subject: [PATCH 23/36] zlib: fix cmake args

---
 apothecary/formulas/_depends/zlib.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apothecary/formulas/_depends/zlib.sh b/apothecary/formulas/_depends/zlib.sh
index 0033a487d..7ae34b3f3 100644
--- a/apothecary/formulas/_depends/zlib.sh
+++ b/apothecary/formulas/_depends/zlib.sh
@@ -29,7 +29,7 @@ function build() {
 		unset TMP
 		unset TEMP
 		if [ $ARCH == 32 ] ; then
-			cmake -G "Visual Studio $VS_VER"
+			cmake -G "Visual Studio $VS_VER Win32"
 			vs-build "zlib.sln" Build "Release|Win32"
 		elif [ $ARCH == 64 ] ; then
 			cmake -G "Visual Studio $VS_VER Win64"

From 21a03808dead07d8547be2203f19d658824ba6de Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Wed, 28 Jun 2017 18:14:30 +0100
Subject: [PATCH 24/36] zlib: cmake - you live and learn...

---
 apothecary/formulas/_depends/zlib.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apothecary/formulas/_depends/zlib.sh b/apothecary/formulas/_depends/zlib.sh
index 7ae34b3f3..0033a487d 100644
--- a/apothecary/formulas/_depends/zlib.sh
+++ b/apothecary/formulas/_depends/zlib.sh
@@ -29,7 +29,7 @@ function build() {
 		unset TMP
 		unset TEMP
 		if [ $ARCH == 32 ] ; then
-			cmake -G "Visual Studio $VS_VER Win32"
+			cmake -G "Visual Studio $VS_VER"
 			vs-build "zlib.sln" Build "Release|Win32"
 		elif [ $ARCH == 64 ] ; then
 			cmake -G "Visual Studio $VS_VER Win64"

From 392156f1f174940734b09c96575b2fbcc4a8a21f Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Wed, 28 Jun 2017 18:38:44 +0100
Subject: [PATCH 25/36] add default fallback vs-build parameters

if no parameters are specified, build release target in current platform
---
 apothecary/apothecary | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/apothecary/apothecary b/apothecary/apothecary
index 834559692..63c461721 100755
--- a/apothecary/apothecary
+++ b/apothecary/apothecary
@@ -864,12 +864,18 @@ function vs-build() {
 		# msbuild is the tool used to build visual studio solutions
 		MSBUILD_PATH="${VS_INSTALL_PATH}\MSBuild\\${VS_VER}.0\Bin\MSBuild.exe"
 		echo "-- Found MSBuild path: ${MSBUILD_PATH}"
-		
+
+		# define fallback build selection if vs-build was not called with enough parameters.
+		DEFAULT_BUILD="Release|x64"
+		if [ $ARCH == 32 ] ; then
+			DEFAULT_BUILD="Release|Win32"
+		fi
+
 		# Cut part before '|' character of third parameter (which defaults to "Default|x64") and store it as BUILD_CONFIGURATION
-		BUILD_CONFIGURATION="$( cut -d '|' -f 1 <<< "${3:-Default|x64}" )"
+		BUILD_CONFIGURATION="$( cut -d '|' -f 1 <<< "${3:-$DEFAULT_BUILD}" )"
 		BUILD_CONFIGURATION=$BUILD_CONFIGURATION
 		# Cut part after '|' character of third parameter (which defaults to "Default|x64") and store it as BUILD_PLATFORM
-		BUILD_PLATFORM="$( cut -d '|' -f 2- <<< "${3:-Default|x64}" )"
+		BUILD_PLATFORM="$( cut -d '|' -f 2- <<< "${3:-$DEFAULT_BUILD}" )"
 		BUILD_PLATFORM=$BUILD_PLATFORM
 
 		echo "-- Build platform: $BUILD_PLATFORM"

From 2832bad70cdcf0b95a8aef6e0ce5869453bdeec1 Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Wed, 28 Jun 2017 18:39:01 +0100
Subject: [PATCH 26/36] update appveyor file

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 34215ce7e..9805f2197 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -28,8 +28,8 @@ environment:
   #VisualStudio 2015 32 bit Building
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       platform: x86
-      VS_VER: 14
       TARGET: vs
+      VS_VER: 14
       ARCH: 32
       VS_NAME: vs2015
   # #VisualStudio 2015 64 bit Building

From 85f26e96efe9d58078e82a37dabcdf51081fe67d Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Wed, 28 Jun 2017 18:52:06 +0100
Subject: [PATCH 27/36] add detection for VS_VER

if it was set from outside, keep, otherwise assume 15
---
 apothecary/apothecary | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/apothecary/apothecary b/apothecary/apothecary
index 63c461721..535a21622 100755
--- a/apothecary/apothecary
+++ b/apothecary/apothecary
@@ -81,8 +81,13 @@ if [ "$(${APOTHECARY_DIR}/ostype.sh)" == "osx" ]; then
     IOS_MIN_SDK_VER=7.0
 fi
 
-# used when building for vs
-VS_VER=15
+# used when building for vs - set to 15 if not set explicitly
+if [ -z ${VS_VER+x} ] ; then 
+	echo "VS_VER was unset - set to 15"
+	VS_VER=15
+else 
+	echo "VS_VER is set to '$VS_VER'"
+fi
 VS_64_BIT_ENV='VC\vcvarsall'
 
 # paths to android SDK, etc

From f2336bd9167a11dd96441dea70155da46029277f Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Wed, 28 Jun 2017 19:03:02 +0100
Subject: [PATCH 28/36] fix opencv build script

debug build Win32 was failing
---
 apothecary/formulas/opencv.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apothecary/formulas/opencv.sh b/apothecary/formulas/opencv.sh
index aac1498fb..d4d61299b 100644
--- a/apothecary/formulas/opencv.sh
+++ b/apothecary/formulas/opencv.sh
@@ -168,8 +168,8 @@ function build() {
 		-DWITH_PNG=OFF \
 		-DWITH_OPENCL=OFF \
 		-DWITH_PVAPI=OFF  | tee ${LOG}
-		vs-build "OpenCV.sln"
-		vs-build "OpenCV.sln" Build "Debug"
+		vs-build "OpenCV.sln" Build "Release|Win32"
+		vs-build "OpenCV.sln" Build "Debug|Win32"
 	elif [ $ARCH == 64 ] ; then
 		mkdir -p build_vs_64
 		cd build_vs_64

From b46cb0fc6a74db37e6baf76ae32975218f347a6d Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Wed, 28 Jun 2017 19:11:17 +0100
Subject: [PATCH 29/36] fix vsbuild for 32 bit vs

one escape too many...
---
 apothecary/apothecary | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apothecary/apothecary b/apothecary/apothecary
index 535a21622..f2ec8c289 100755
--- a/apothecary/apothecary
+++ b/apothecary/apothecary
@@ -896,10 +896,10 @@ function vs-build() {
 	else
 		#statements
 		if [ $ARCH == 32 ] ; then
-			cmd.exe //c "call \"%VS${VS_VER}0COMNTOOLS%vsvars32.bat\" && $VS_BUILD_TOOL $1 /${2:-Build} \"${3:-Release}\""
+			cmd.exe /c "call \"%VS${VS_VER}0COMNTOOLS%vsvars32.bat\" && $VS_BUILD_TOOL $1 /${2:-Build} \"${3:-Release}\""
 		elif [ $ARCH == 64 ] ; then
 			echo "call \"%VS${VS_VER}0COMNTOOLS%..\\..\\${VS_64_BIT_ENV}\" amd64 && $VS_BUILD_TOOL $1 /${2:-Build} \"${3:-Release}\""
-	        cmd.exe //c /s "call \"%VS${VS_VER}0COMNTOOLS%..\\..\\${VS_64_BIT_ENV}\" amd64 && $VS_BUILD_TOOL $1 /${2:-Build} \"${3:-Release}\""
+	        cmd.exe /c /s "call \"%VS${VS_VER}0COMNTOOLS%..\\..\\${VS_64_BIT_ENV}\" amd64 && $VS_BUILD_TOOL $1 /${2:-Build} \"${3:-Release}\""
 		fi
 	fi
 

From 6c7bf8f05cd2124920adb6749c54afee647c024f Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Wed, 28 Jun 2017 19:13:11 +0100
Subject: [PATCH 30/36] appveyor: full matrix

compile full matrix
---
 .appveyor.yml | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 9805f2197..694d8adf1 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -5,13 +5,13 @@ environment:
     APPVEYOR_OS_NAME: windows
     CHERE_INVOKING: 1
   matrix:
-  # # VisualStudio 2017 64 bit Building
-  #   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-  #     platform: x64
-  #     TARGET: vs
-  #     VS_VER: 15
-  #     ARCH: 64
-  #     VS_NAME: vs2017
+  # VisualStudio 2017 64 bit Building
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      platform: x64
+      TARGET: vs
+      VS_VER: 15
+      ARCH: 64
+      VS_NAME: vs2017
   # VisualStudio 2017 32 bit Building
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       platform: x86
@@ -19,12 +19,12 @@ environment:
       VS_VER: 15
       ARCH: 32
       VS_NAME: vs2017
-  # # MSYS2 Building
-  #   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-  #     platform: x86
-  #     TARGET: msys2
-  #     ARCH: 32
-  #     VS_NAME: 
+  # MSYS2 Building
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      platform: x86
+      TARGET: msys2
+      ARCH: 32
+      VS_NAME: 
   #VisualStudio 2015 32 bit Building
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       platform: x86
@@ -32,13 +32,13 @@ environment:
       VS_VER: 14
       ARCH: 32
       VS_NAME: vs2015
-  # #VisualStudio 2015 64 bit Building
-  #   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-  #     platform: x64
-  #     VS_VER: 14
-  #     TARGET: vs
-  #     ARCH: 64
-  #     VS_NAME: vs2015
+  #VisualStudio 2015 64 bit Building
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      platform: x64
+      VS_VER: 14
+      TARGET: vs
+      ARCH: 64
+      VS_NAME: vs2015
 
 configuration: Debug
 shallow_clone: true

From 731925fc6ceaf1ad62113eba405e50b9dc2af9ce Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Thu, 29 Jun 2017 10:03:02 +0100
Subject: [PATCH 31/36] fixes after full matrix build

+ update targets to specifically mention win32 for 32 bit vs targets
+ update artifacts naming
---
 .appveyor.yml                     | 44 +++++++++++++++----------------
 apothecary/formulas/pugixml.sh    |  4 +--
 apothecary/formulas/rtAudio.sh    |  4 +--
 apothecary/formulas/videoInput.sh |  4 +--
 scripts/build.sh                  |  2 +-
 5 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 694d8adf1..36e71cd5b 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -5,40 +5,40 @@ environment:
     APPVEYOR_OS_NAME: windows
     CHERE_INVOKING: 1
   matrix:
-  # VisualStudio 2017 64 bit Building
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      platform: x64
-      TARGET: vs
-      VS_VER: 15
-      ARCH: 64
-      VS_NAME: vs2017
+  # # VisualStudio 2017 64 bit Building
+  #   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+  #     platform: x64
+  #     TARGET: vs
+  #     VS_VER: 15
+  #     ARCH: 64
+  #     VS_NAME: 2017
   # VisualStudio 2017 32 bit Building
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       platform: x86
       TARGET: vs
       VS_VER: 15
       ARCH: 32
-      VS_NAME: vs2017
+      VS_NAME: 2017
   # MSYS2 Building
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       platform: x86
       TARGET: msys2
       ARCH: 32
       VS_NAME: 
-  #VisualStudio 2015 32 bit Building
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      platform: x86
-      TARGET: vs
-      VS_VER: 14
-      ARCH: 32
-      VS_NAME: vs2015
-  #VisualStudio 2015 64 bit Building
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      platform: x64
-      VS_VER: 14
-      TARGET: vs
-      ARCH: 64
-      VS_NAME: vs2015
+  # #VisualStudio 2015 32 bit Building
+  #   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+  #     platform: x86
+  #     TARGET: vs
+  #     VS_VER: 14
+  #     ARCH: 32
+  #     VS_NAME: 2015
+  # #VisualStudio 2015 64 bit Building
+  #   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+  #     platform: x64
+  #     VS_VER: 14
+  #     TARGET: vs
+  #     ARCH: 64
+  #     VS_NAME: 2015
 
 configuration: Debug
 shallow_clone: true
diff --git a/apothecary/formulas/pugixml.sh b/apothecary/formulas/pugixml.sh
index d6a2ca746..5b19a16fb 100644
--- a/apothecary/formulas/pugixml.sh
+++ b/apothecary/formulas/pugixml.sh
@@ -44,8 +44,8 @@ function build() {
 		unset TEMP
 		cd scripts
 		if [ $ARCH == 32 ] ; then
-				vs-build pugixml_vs2015.vcxproj Build "Release|x86"
-				vs-build pugixml_vs2015.vcxproj Build "Debug|x86"
+				vs-build pugixml_vs2015.vcxproj Build "Release|Win32"
+				vs-build pugixml_vs2015.vcxproj Build "Debug|Win32"
 		else
 				vs-build pugixml_vs2015.vcxproj Build "Release|x64"
 				vs-build pugixml_vs2015.vcxproj Build "Debug|x64"
diff --git a/apothecary/formulas/rtAudio.sh b/apothecary/formulas/rtAudio.sh
index b357d4325..cbc420c5b 100644
--- a/apothecary/formulas/rtAudio.sh
+++ b/apothecary/formulas/rtAudio.sh
@@ -86,8 +86,8 @@ function build() {
 			mkdir -p build_vs_32
 			cd build_vs_32
 			cmake .. -G "Visual Studio $VS_VER"  -DAUDIO_WINDOWS_WASAPI=ON -DAUDIO_WINDOWS_DS=ON -DAUDIO_WINDOWS_ASIO=ON
-			vs-build "rtaudio_static.vcxproj"
-			vs-build "rtaudio_static.vcxproj" Build "Debug"
+			vs-build "rtaudio_static.vcxproj" Build "Release|Win32"
+			vs-build "rtaudio_static.vcxproj" Build "Debug|Win32"
 		elif [ $ARCH == 64 ] ; then
 			mkdir -p build_vs_64
 			cd build_vs_64
diff --git a/apothecary/formulas/videoInput.sh b/apothecary/formulas/videoInput.sh
index e9dfad540..e9ecd6154 100644
--- a/apothecary/formulas/videoInput.sh
+++ b/apothecary/formulas/videoInput.sh
@@ -35,8 +35,8 @@ function build() {
 		unset TEMP
 		cd VS-videoInputcompileAsLib
 		if [ $ARCH == 32 ] ; then
-			vs-build "videoInput.sln"
-			vs-build "videoInput.sln" Build "Debug"
+			vs-build "videoInput.sln" Build "Release|Win32"
+			vs-build "videoInput.sln" Build "Debug|Win32"
 		elif [ $ARCH == 64 ] ; then
 			vs-build "videoInput.sln" Build "Release|x64"
 			vs-build "videoInput.sln" Build "Debug|x64"
diff --git a/scripts/build.sh b/scripts/build.sh
index 7aaf41dfe..aef5508e4 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -153,7 +153,7 @@ cd $ROOT
 echo "Compressing libraries from $PWD"
 LIBS=$(ls | grep -v \.appveyor.yml | grep -v \.travis.yml | grep -v \.gitignore | grep -v apothecary | grep -v scripts)
 if [ ! -z ${APPVEYOR+x} ]; then
-	TARBALL=openFrameworksLibs_${APPVEYOR_REPO_BRANCH}_${TARGET}_${VS_NAME}${ARCH}.zip
+	TARBALL=openFrameworksLibs_${APPVEYOR_REPO_BRANCH}_${TARGET}${VS_NAME}_${ARCH}.zip
 	7z a $TARBALL $LIBS
 else
 	TARBALL=openFrameworksLibs_${TRAVIS_BRANCH}_$TARGET$OPT$OPT2.tar.bz2

From 2b0b5c043f77b013502dd2830aa4bd6e77f4a5b2 Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Thu, 29 Jun 2017 10:13:09 +0100
Subject: [PATCH 32/36] full matrix

---
 .appveyor.yml | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 36e71cd5b..325ff2e91 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -5,13 +5,13 @@ environment:
     APPVEYOR_OS_NAME: windows
     CHERE_INVOKING: 1
   matrix:
-  # # VisualStudio 2017 64 bit Building
-  #   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-  #     platform: x64
-  #     TARGET: vs
-  #     VS_VER: 15
-  #     ARCH: 64
-  #     VS_NAME: 2017
+  # VisualStudio 2017 64 bit Building
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      platform: x64
+      TARGET: vs
+      VS_VER: 15
+      ARCH: 64
+      VS_NAME: 2017
   # VisualStudio 2017 32 bit Building
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       platform: x86
@@ -25,20 +25,20 @@ environment:
       TARGET: msys2
       ARCH: 32
       VS_NAME: 
-  # #VisualStudio 2015 32 bit Building
-  #   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-  #     platform: x86
-  #     TARGET: vs
-  #     VS_VER: 14
-  #     ARCH: 32
-  #     VS_NAME: 2015
-  # #VisualStudio 2015 64 bit Building
-  #   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-  #     platform: x64
-  #     VS_VER: 14
-  #     TARGET: vs
-  #     ARCH: 64
-  #     VS_NAME: 2015
+  #VisualStudio 2015 32 bit Building
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      platform: x86
+      TARGET: vs
+      VS_VER: 14
+      ARCH: 32
+      VS_NAME: 2015
+  #VisualStudio 2015 64 bit Building
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      platform: x64
+      VS_VER: 14
+      TARGET: vs
+      ARCH: 64
+      VS_NAME: 2015
 
 configuration: Debug
 shallow_clone: true

From 695ac15b519f9a62e2774440440394187fc597a2 Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Thu, 29 Jun 2017 11:30:25 +0100
Subject: [PATCH 33/36] fix pugixml

---
 apothecary/apothecary          |  2 +-
 apothecary/formulas/pugixml.sh | 22 +++++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/apothecary/apothecary b/apothecary/apothecary
index f2ec8c289..ead79507e 100755
--- a/apothecary/apothecary
+++ b/apothecary/apothecary
@@ -899,7 +899,7 @@ function vs-build() {
 			cmd.exe /c "call \"%VS${VS_VER}0COMNTOOLS%vsvars32.bat\" && $VS_BUILD_TOOL $1 /${2:-Build} \"${3:-Release}\""
 		elif [ $ARCH == 64 ] ; then
 			echo "call \"%VS${VS_VER}0COMNTOOLS%..\\..\\${VS_64_BIT_ENV}\" amd64 && $VS_BUILD_TOOL $1 /${2:-Build} \"${3:-Release}\""
-	        cmd.exe /c /s "call \"%VS${VS_VER}0COMNTOOLS%..\\..\\${VS_64_BIT_ENV}\" amd64 && $VS_BUILD_TOOL $1 /${2:-Build} \"${3:-Release}\""
+	        cmd.exe /c "call \"%VS${VS_VER}0COMNTOOLS%..\\..\\${VS_64_BIT_ENV}\" amd64 && $VS_BUILD_TOOL $1 /${2:-Build} \"${3:-Release}\""
 		fi
 	fi
 
diff --git a/apothecary/formulas/pugixml.sh b/apothecary/formulas/pugixml.sh
index 5b19a16fb..813c98fc3 100644
--- a/apothecary/formulas/pugixml.sh
+++ b/apothecary/formulas/pugixml.sh
@@ -43,13 +43,25 @@ function build() {
 		unset TMP
 		unset TEMP
 		cd scripts
-		if [ $ARCH == 32 ] ; then
-				vs-build pugixml_vs2015.vcxproj Build "Release|Win32"
-				vs-build pugixml_vs2015.vcxproj Build "Debug|Win32"
+
+		if [[ $VS_VER -gt 14 ]]; then
+			if [ $ARCH == 32 ] ; then
+					vs-build "pugixml_vs2015.vcxproj" build "Release|Win32"
+					vs-build "pugixml_vs2015.vcxproj" build "Debug|Win32"
+			else
+					vs-build "pugixml_vs2015.vcxproj" build "Release|x64"
+					vs-build "pugixml_vs2015.vcxproj" build "Debug|x64"
+			fi
 		else
-				vs-build pugixml_vs2015.vcxproj Build "Release|x64"
-				vs-build pugixml_vs2015.vcxproj Build "Debug|x64"
+			if [ $ARCH == 32 ] ; then
+					vs-build "pugixml_vs2015.vcxproj" build "Release"
+					vs-build "pugixml_vs2015.vcxproj" build "Debug"
+			else
+					vs-build "pugixml_vs2015.vcxproj" build "Release"
+					vs-build "pugixml_vs2015.vcxproj" build "Debug"
+			fi
 		fi
+
 	elif [ "$TYPE" == "android" ]; then
         source ../../android_configure.sh $ABI
 		# Compile the program

From 7feee62229089fff9c043decc00d16fedfb62670 Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Thu, 29 Jun 2017 11:30:43 +0100
Subject: [PATCH 34/36] test only vs2015

---
 .appveyor.yml | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 325ff2e91..67883e3a1 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -5,26 +5,26 @@ environment:
     APPVEYOR_OS_NAME: windows
     CHERE_INVOKING: 1
   matrix:
-  # VisualStudio 2017 64 bit Building
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      platform: x64
-      TARGET: vs
-      VS_VER: 15
-      ARCH: 64
-      VS_NAME: 2017
-  # VisualStudio 2017 32 bit Building
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      platform: x86
-      TARGET: vs
-      VS_VER: 15
-      ARCH: 32
-      VS_NAME: 2017
-  # MSYS2 Building
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      platform: x86
-      TARGET: msys2
-      ARCH: 32
-      VS_NAME: 
+  # # VisualStudio 2017 64 bit Building
+  #   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+  #     platform: x64
+  #     TARGET: vs
+  #     VS_VER: 15
+  #     ARCH: 64
+  #     VS_NAME: 2017
+  # # VisualStudio 2017 32 bit Building
+  #   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+  #     platform: x86
+  #     TARGET: vs
+  #     VS_VER: 15
+  #     ARCH: 32
+  #     VS_NAME: 2017
+  # # MSYS2 Building
+  #   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+  #     platform: x86
+  #     TARGET: msys2
+  #     ARCH: 32
+  #     VS_NAME: 
   #VisualStudio 2015 32 bit Building
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       platform: x86

From e958befc2a682932d76924f38de7fd78f9799006 Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Thu, 29 Jun 2017 11:33:43 +0100
Subject: [PATCH 35/36] full matrix

---
 .appveyor.yml | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 67883e3a1..325ff2e91 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -5,26 +5,26 @@ environment:
     APPVEYOR_OS_NAME: windows
     CHERE_INVOKING: 1
   matrix:
-  # # VisualStudio 2017 64 bit Building
-  #   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-  #     platform: x64
-  #     TARGET: vs
-  #     VS_VER: 15
-  #     ARCH: 64
-  #     VS_NAME: 2017
-  # # VisualStudio 2017 32 bit Building
-  #   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-  #     platform: x86
-  #     TARGET: vs
-  #     VS_VER: 15
-  #     ARCH: 32
-  #     VS_NAME: 2017
-  # # MSYS2 Building
-  #   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-  #     platform: x86
-  #     TARGET: msys2
-  #     ARCH: 32
-  #     VS_NAME: 
+  # VisualStudio 2017 64 bit Building
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      platform: x64
+      TARGET: vs
+      VS_VER: 15
+      ARCH: 64
+      VS_NAME: 2017
+  # VisualStudio 2017 32 bit Building
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      platform: x86
+      TARGET: vs
+      VS_VER: 15
+      ARCH: 32
+      VS_NAME: 2017
+  # MSYS2 Building
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      platform: x86
+      TARGET: msys2
+      ARCH: 32
+      VS_NAME: 
   #VisualStudio 2015 32 bit Building
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       platform: x86

From a20913908a7d83fc839adcb1909ca5243f99fab3 Mon Sep 17 00:00:00 2001
From: Tim Gfrerer <tim@poniesandlight.co.uk>
Date: Thu, 29 Jun 2017 12:18:18 +0100
Subject: [PATCH 36/36] fix pugixml 64 vs2015

---
 apothecary/formulas/pugixml.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apothecary/formulas/pugixml.sh b/apothecary/formulas/pugixml.sh
index 813c98fc3..a5a95abe5 100644
--- a/apothecary/formulas/pugixml.sh
+++ b/apothecary/formulas/pugixml.sh
@@ -57,8 +57,8 @@ function build() {
 					vs-build "pugixml_vs2015.vcxproj" build "Release"
 					vs-build "pugixml_vs2015.vcxproj" build "Debug"
 			else
-					vs-build "pugixml_vs2015.vcxproj" build "Release"
-					vs-build "pugixml_vs2015.vcxproj" build "Debug"
+					vs-build "pugixml_vs2015.vcxproj" build "Release|x64"
+					vs-build "pugixml_vs2015.vcxproj" build "Debug|x64"
 			fi
 		fi