From 639ca655b62d9e721c635fa9794cb4490ff48526 Mon Sep 17 00:00:00 2001
From: martin <martin@c6295689-39f2-0310-b995-f0e70906c6a9>
Date: Mon, 11 Apr 2011 14:42:48 +0000
Subject: [PATCH] WindowsInstaller: Correct support for x64 builds

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5327 c6295689-39f2-0310-b995-f0e70906c6a9
---
 win32/Make.rules.mak | 2 ++
 win32/Makefile.mak   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/win32/Make.rules.mak b/win32/Make.rules.mak
index 04b40803..a320f093 100644
--- a/win32/Make.rules.mak
+++ b/win32/Make.rules.mak
@@ -57,9 +57,11 @@ COPTS =  /W3 /D_CRT_SECURE_NO_DEPRECATE /MT /nologo /DHAVE_CONFIG_H $(ALL_INCLUD
 !IF "$(BUILD_FOR)" == "WIN64"
 LINKFLAGS = /NOLOGO /INCREMENTAL:NO /MACHINE:X64 /MANIFEST:NO /NODEFAULTLIB:MSVCRTD  /NODEFAULTLIB:MSVCRT /NODEFAULTLIB:LIBCMTD
 LIBFLAGS =  /nologo /machine:x64
+CANDLEFLAGS = -dPlatform=x64
 !ELSE
 LINKFLAGS = /NOLOGO /INCREMENTAL:NO /MACHINE:X86 /MANIFEST:NO /NODEFAULTLIB:MSVCRTD  /NODEFAULTLIB:MSVCRT /NODEFAULTLIB:LIBCMTD
 LIBFLAGS =  /nologo /machine:x86
+CANDLEFLAGS = -dPlatform=x86
 !ENDIF
 .c.obj::
 	cl $(COPTS) /c $<
diff --git a/win32/Makefile.mak b/win32/Makefile.mak
index 372df098..f3be55bd 100644
--- a/win32/Makefile.mak
+++ b/win32/Makefile.mak
@@ -11,7 +11,7 @@ OpenSC.msi: OpenSC.wixobj
         $(WIX_PATH)\bin\light.exe -sh -ext WixUIExtension -ext WiXUtilExtension $?
 
 OpenSC.wixobj: OpenSC.wxs
-        $(WIX_PATH)\bin\candle.exe -ext WiXUtilExtension -dSOURCE_DIR=$(TOPDIR) $?
+        $(WIX_PATH)\bin\candle.exe -ext WiXUtilExtension -dSOURCE_DIR=$(TOPDIR) $(CANDLEFLAGS) $?
 
 clean::
 	del /Q config.h *.msi *.wixobj *.wixpdb