giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #644 from vletoux/appveyor-fixes 

Fix AppVeyor builds
This commit is contained in:
Frank Morgner 2015-12-23 20:51:56 +01:00
parent 2fd32fdd73 48782e768d
commit 07be93a597
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appveyor.yml
View File

@ -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") {

6
win32/Make.rules.mak
View File

@ -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