From aa8ad8d5b286772518ff865fad26410946f4fb9f Mon Sep 17 00:00:00 2001
From: Viktor Tarasov <viktor.tarasov@gmail.com>
Date: Fri, 22 Jan 2016 15:18:58 +0100
Subject: [PATCH] build: restore build on Win32

---
 win32/Make.rules.mak | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/win32/Make.rules.mak b/win32/Make.rules.mak
index 1a548b19..33fc91b6 100644
--- a/win32/Make.rules.mak
+++ b/win32/Make.rules.mak
@@ -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