From 51be65ba9b48966465e3bcd40c898c15f7b74120 Mon Sep 17 00:00:00 2001 From: LE TOUX Vincent Date: Wed, 23 Dec 2015 18:44:05 +0100 Subject: [PATCH 1/3] appveyor: fix OpenSSL version --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 4aae0b61..d4478cc2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -28,7 +28,7 @@ install: throw "There are newer queued builds for this pull request, failing early." } - date /T & time /T - set PATH=C:\cygwin\bin;%PATH% - - set OPENSSL_VER=1_0_2d + - set OPENSSL_VER=1_0_2e - set ZLIB_VER=128 - ps: >- If ($env:Platform -Match "x86") { From 9a6e11e28a8c4132967cf02cf4f3d3ea0655d68d Mon Sep 17 00:00:00 2001 From: LE TOUX Vincent Date: Wed, 23 Dec 2015 18:46:30 +0100 Subject: [PATCH 2/3] appveyor: fix wcautil.h not found --- win32/Make.rules.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32/Make.rules.mak b/win32/Make.rules.mak index 7c2c27a1..b4555f66 100644 --- a/win32/Make.rules.mak +++ b/win32/Make.rules.mak @@ -5,7 +5,7 @@ MINIDRIVER_DEF = /DENABLE_MINIDRIVER #Build MSI with the Windows Installer XML (WIX) toolkit, requires WIX >= 3.9 WIX_PATH = C:\Program Files (x86)\WiX Toolset v3.10 -WIX_INCL_DIR = "/I$(WIX_PATH)\SDK\VS20$(VSVER)\inc" +WIX_INCL_DIR = "/I$(WIX_PATH)\SDK\VS2010\inc" !IF "$(BUILD_FOR)" == "WIN64" WIX_LIBS = "$(WIX_PATH)\SDK\VS20$(VSVER)\lib\x64\dutil.lib" "$(WIX_PATH)\SDK\VS20$(VSVER)\lib\x64\wcautil.lib" !ELSE From 48782e768de6933e3aec666439604c66b0cea8cc Mon Sep 17 00:00:00 2001 From: LE TOUX Vincent Date: Wed, 23 Dec 2015 18:52:49 +0100 Subject: [PATCH 3/3] appveyor: fix wix lib not found --- win32/Make.rules.mak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32/Make.rules.mak b/win32/Make.rules.mak index b4555f66..1a2aebc8 100644 --- a/win32/Make.rules.mak +++ b/win32/Make.rules.mak @@ -7,9 +7,9 @@ MINIDRIVER_DEF = /DENABLE_MINIDRIVER WIX_PATH = C:\Program Files (x86)\WiX Toolset v3.10 WIX_INCL_DIR = "/I$(WIX_PATH)\SDK\VS2010\inc" !IF "$(BUILD_FOR)" == "WIN64" -WIX_LIBS = "$(WIX_PATH)\SDK\VS20$(VSVER)\lib\x64\dutil.lib" "$(WIX_PATH)\SDK\VS20$(VSVER)\lib\x64\wcautil.lib" +WIX_LIBS = "$(WIX_PATH)\SDK\VS2010\lib\x64\dutil.lib" "$(WIX_PATH)\SDK\VS2010\lib\x64\wcautil.lib" !ELSE -WIX_LIBS = "$(WIX_PATH)\SDK\VS20$(VSVER)\lib\x86\dutil.lib" "$(WIX_PATH)\SDK\VS20$(VSVER)\lib\x86\wcautil.lib" +WIX_LIBS = "$(WIX_PATH)\SDK\VS2010\lib\x86\dutil.lib" "$(WIX_PATH)\SDK\VS2010\lib\x86\wcautil.lib" !ENDIF #Include support for Secure Messaging