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") { diff --git a/win32/Make.rules.mak b/win32/Make.rules.mak index 7c2c27a1..1a2aebc8 100644 --- a/win32/Make.rules.mak +++ b/win32/Make.rules.mak @@ -5,11 +5,11 @@ 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" +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