diff --git a/win32/Make.rules.mak b/win32/Make.rules.mak
index 494b662a..1f8deb90 100644
--- a/win32/Make.rules.mak
+++ b/win32/Make.rules.mak
@@ -48,8 +48,7 @@ OPENSSL_LIB = $(OPENSSL_DIR)\lib\VC\$(OPENSSL_STATIC_DIR)\libeay32MT.lib user32.
PROGRAMS_OPENSSL = cryptoflex-tool.exe pkcs15-init.exe netkey-tool.exe piv-tool.exe \
westcos-tool.exe sc-hsm-tool.exe dnie-tool.exe
OPENSC_FEATURES = $(OPENSC_FEATURES) openssl
-!ELSE
-CANDLEFLAG_LIGHT = -dLight
+CANDLEFLAGS = -dOpenSSL="$(OPENSSL_DIR)" $(CANDLEFLAGS)
!ENDIF
@@ -63,6 +62,7 @@ CANDLEFLAG_LIGHT = -dLight
ZLIB_INCL_DIR = /IC:\zlib-dll\include
ZLIB_LIB = C:\zlib-dll\lib\zdll.lib
OPENSC_FEATURES = $(OPENSC_FEATURES) zlib
+CANDLEFLAGS = -dzlib="C:\zlib-dll" $(CANDLEFLAGS)
!ENDIF
# Used for MiniDriver
@@ -90,11 +90,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 $(LINKDEBUGFLAGS)
LIBFLAGS = /nologo /machine:x64
-CANDLEFLAGS = -dPlatform=x64 $(CANDLEFLAG_LIGHT)
+CANDLEFLAGS = -dPlatform=x64 $(CANDLEFLAGS)
!ELSE
LINKFLAGS = /NOLOGO /INCREMENTAL:NO /MACHINE:X86 /MANIFEST:NO /NODEFAULTLIB:MSVCRTD /NODEFAULTLIB:MSVCRT $(LINKDEBUGFLAGS)
LIBFLAGS = /nologo /machine:x86
-CANDLEFLAGS = -dPlatform=x86 $(CANDLEFLAG_LIGHT)
+CANDLEFLAGS = -dPlatform=x86 $(CANDLEFLAGS)
!ENDIF
.c.obj::
cl $(CODE_OPTIMIZATION) $(COPTS) /c $<
diff --git a/win32/OpenSC.wxs.in b/win32/OpenSC.wxs.in
index 95f5a366..5c8ef82a 100644
--- a/win32/OpenSC.wxs.in
+++ b/win32/OpenSC.wxs.in
@@ -1,6 +1,6 @@
-
+
@@ -10,7 +10,7 @@
-
+
@@ -116,6 +116,11 @@
+
+
+
+
+
@@ -146,7 +151,10 @@
-
+
+
+
+
@@ -173,7 +181,7 @@
-
+
@@ -284,8 +292,12 @@
+
+
+
-
+
+
@@ -311,7 +323,7 @@
-
+