build: restore build on Win32

This commit is contained in:
Viktor Tarasov 2016-01-22 15:18:58 +01:00
parent 4f4b6c962a
commit aa8ad8d5b2
1 changed files with 10 additions and 3 deletions

View File

@ -1,10 +1,18 @@
OPENSC_FEATURES = pcsc
!IF "$(BUILD_ON)" == "WIN32"
PROGRAMFILES_PATH = C:\Program Files
!ELSE
PROGRAMFILES_PATH = C:\Program Files (x86)
!ENDIF
#Include support for minidriver
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_PATH = $(PROGRAMFILES_PATH)\WiX Toolset v3.10
WIX_INCL_DIR = "/I$(WIX_PATH)\SDK\VS2010\inc"
!IF "$(BUILD_FOR)" == "WIN64"
WIX_LIBS = "$(WIX_PATH)\SDK\VS2010\lib\x64\dutil.lib" "$(WIX_PATH)\SDK\VS2010\lib\x64\wcautil.lib"
@ -67,9 +75,8 @@ CANDLEFLAGS = -dzlib="C:\zlib-dll" $(CANDLEFLAGS)
!ENDIF
# Used for MiniDriver
CNGSDK_INCL_DIR = "/IC:\Program Files (x86)\Microsoft CNG Development Kit\Include"
CNGSDK_INCL_DIR = "/I$(PROGRAMFILES_PATH)\Microsoft CNG Development Kit\Include"
# Mandatory path to 'ISO C9x compliant stdint.h and inttypes.h for Microsoft Visual Studio'
# http://msinttypes.googlecode.com/files/msinttypes-r26.zip
# INTTYPES_INCL_DIR = /IC:\opensc\dependencies\msys\local