include zlib1.dll and libeay32.dll in installer
This commit is contained in:
parent
9f7583a022
commit
90fb40f65e
@ -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 \
|
PROGRAMS_OPENSSL = cryptoflex-tool.exe pkcs15-init.exe netkey-tool.exe piv-tool.exe \
|
||||||
westcos-tool.exe sc-hsm-tool.exe dnie-tool.exe
|
westcos-tool.exe sc-hsm-tool.exe dnie-tool.exe
|
||||||
OPENSC_FEATURES = $(OPENSC_FEATURES) openssl
|
OPENSC_FEATURES = $(OPENSC_FEATURES) openssl
|
||||||
!ELSE
|
CANDLEFLAGS = -dOpenSSL="$(OPENSSL_DIR)" $(CANDLEFLAGS)
|
||||||
CANDLEFLAG_LIGHT = -dLight
|
|
||||||
!ENDIF
|
!ENDIF
|
||||||
|
|
||||||
|
|
||||||
@ -63,6 +62,7 @@ CANDLEFLAG_LIGHT = -dLight
|
|||||||
ZLIB_INCL_DIR = /IC:\zlib-dll\include
|
ZLIB_INCL_DIR = /IC:\zlib-dll\include
|
||||||
ZLIB_LIB = C:\zlib-dll\lib\zdll.lib
|
ZLIB_LIB = C:\zlib-dll\lib\zdll.lib
|
||||||
OPENSC_FEATURES = $(OPENSC_FEATURES) zlib
|
OPENSC_FEATURES = $(OPENSC_FEATURES) zlib
|
||||||
|
CANDLEFLAGS = -dzlib="C:\zlib-dll" $(CANDLEFLAGS)
|
||||||
!ENDIF
|
!ENDIF
|
||||||
|
|
||||||
# Used for MiniDriver
|
# 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"
|
!IF "$(BUILD_FOR)" == "WIN64"
|
||||||
LINKFLAGS = /NOLOGO /INCREMENTAL:NO /MACHINE:X64 /MANIFEST:NO /NODEFAULTLIB:MSVCRTD /NODEFAULTLIB:MSVCRT $(LINKDEBUGFLAGS)
|
LINKFLAGS = /NOLOGO /INCREMENTAL:NO /MACHINE:X64 /MANIFEST:NO /NODEFAULTLIB:MSVCRTD /NODEFAULTLIB:MSVCRT $(LINKDEBUGFLAGS)
|
||||||
LIBFLAGS = /nologo /machine:x64
|
LIBFLAGS = /nologo /machine:x64
|
||||||
CANDLEFLAGS = -dPlatform=x64 $(CANDLEFLAG_LIGHT)
|
CANDLEFLAGS = -dPlatform=x64 $(CANDLEFLAGS)
|
||||||
!ELSE
|
!ELSE
|
||||||
LINKFLAGS = /NOLOGO /INCREMENTAL:NO /MACHINE:X86 /MANIFEST:NO /NODEFAULTLIB:MSVCRTD /NODEFAULTLIB:MSVCRT $(LINKDEBUGFLAGS)
|
LINKFLAGS = /NOLOGO /INCREMENTAL:NO /MACHINE:X86 /MANIFEST:NO /NODEFAULTLIB:MSVCRTD /NODEFAULTLIB:MSVCRT $(LINKDEBUGFLAGS)
|
||||||
LIBFLAGS = /nologo /machine:x86
|
LIBFLAGS = /nologo /machine:x86
|
||||||
CANDLEFLAGS = -dPlatform=x86 $(CANDLEFLAG_LIGHT)
|
CANDLEFLAGS = -dPlatform=x86 $(CANDLEFLAGS)
|
||||||
!ENDIF
|
!ENDIF
|
||||||
.c.obj::
|
.c.obj::
|
||||||
cl $(CODE_OPTIMIZATION) $(COPTS) /c $<
|
cl $(CODE_OPTIMIZATION) $(COPTS) /c $<
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="windows-1252"?>
|
<?xml version="1.0" encoding="windows-1252"?>
|
||||||
<?if $(var.Platform) = x64 ?>
|
<?if $(var.Platform) = x64 ?>
|
||||||
<?ifdef Light ?>
|
<?ifndef OpenSSL ?>
|
||||||
<?define ProductName = "@OPENSC_VS_FF_PRODUCT_NAME@ Light (64bit)" ?>
|
<?define ProductName = "@OPENSC_VS_FF_PRODUCT_NAME@ Light (64bit)" ?>
|
||||||
<?else ?>
|
<?else ?>
|
||||||
<?define ProductName = "@OPENSC_VS_FF_PRODUCT_NAME@ (64bit)" ?>
|
<?define ProductName = "@OPENSC_VS_FF_PRODUCT_NAME@ (64bit)" ?>
|
||||||
@ -10,7 +10,7 @@
|
|||||||
<?define PlatformSystemFolder = "System64Folder" ?>
|
<?define PlatformSystemFolder = "System64Folder" ?>
|
||||||
<?define PlatformUpgradeCode = "{9A449570-69A2-11E0-9CC6-955B4824019B}" ?>
|
<?define PlatformUpgradeCode = "{9A449570-69A2-11E0-9CC6-955B4824019B}" ?>
|
||||||
<?else ?>
|
<?else ?>
|
||||||
<?ifdef Light ?>
|
<?ifndef OpenSSL ?>
|
||||||
<?define ProductName = "@OPENSC_VS_FF_PRODUCT_NAME@ Light" ?>
|
<?define ProductName = "@OPENSC_VS_FF_PRODUCT_NAME@ Light" ?>
|
||||||
<?else ?>
|
<?else ?>
|
||||||
<?define ProductName = "@OPENSC_VS_FF_PRODUCT_NAME@" ?>
|
<?define ProductName = "@OPENSC_VS_FF_PRODUCT_NAME@" ?>
|
||||||
@ -116,6 +116,11 @@
|
|||||||
|
|
||||||
<!-- Tools have their own folder -->
|
<!-- Tools have their own folder -->
|
||||||
<Directory Id="INSTALLDIR_TOOLS" Name="tools">
|
<Directory Id="INSTALLDIR_TOOLS" Name="tools">
|
||||||
|
<?ifdef zlib ?>
|
||||||
|
<Component Id="zlib1.dll" Guid="*" Win64="$(var.Win64YesNo)">
|
||||||
|
<File Source="$(var.zlib)\zlib1.dll" Vital="yes"/>
|
||||||
|
</Component>
|
||||||
|
<?endif ?>
|
||||||
<Component Id="opensc.dll" Guid="*" Win64="$(var.Win64YesNo)">
|
<Component Id="opensc.dll" Guid="*" Win64="$(var.Win64YesNo)">
|
||||||
<File Source="$(var.SOURCE_DIR)\src\libopensc\opensc.dll" Vital="yes"/>
|
<File Source="$(var.SOURCE_DIR)\src\libopensc\opensc.dll" Vital="yes"/>
|
||||||
</Component>
|
</Component>
|
||||||
@ -146,7 +151,10 @@
|
|||||||
<Component Id="iasecc_tool.exe" Guid="*" Win64="$(var.Win64YesNo)">
|
<Component Id="iasecc_tool.exe" Guid="*" Win64="$(var.Win64YesNo)">
|
||||||
<File Source="$(var.SOURCE_DIR)\src\tools\iasecc-tool.exe" Vital="yes"/>
|
<File Source="$(var.SOURCE_DIR)\src\tools\iasecc-tool.exe" Vital="yes"/>
|
||||||
</Component>
|
</Component>
|
||||||
<?ifndef Light ?>
|
<?ifdef OpenSSL ?>
|
||||||
|
<Component Id="libeay32.dll" Guid="*" Win64="$(var.Win64YesNo)">
|
||||||
|
<File Source="$(var.OpenSSL)\libeay32.dll" Vital="yes"/>
|
||||||
|
</Component>
|
||||||
<Component Id="smm_local.dll" Guid="*" Win64="$(var.Win64YesNo)">
|
<Component Id="smm_local.dll" Guid="*" Win64="$(var.Win64YesNo)">
|
||||||
<File Source="$(var.SOURCE_DIR)\src\smm\smm-local.dll" Vital="yes"/>
|
<File Source="$(var.SOURCE_DIR)\src\smm\smm-local.dll" Vital="yes"/>
|
||||||
</Component>
|
</Component>
|
||||||
@ -173,7 +181,7 @@
|
|||||||
</Component>
|
</Component>
|
||||||
<?endif ?>
|
<?endif ?>
|
||||||
</Directory>
|
</Directory>
|
||||||
<?ifndef Light ?>
|
<?ifdef OpenSSL ?>
|
||||||
<Directory Id="INSTALLDIR_PROFILES" Name="profiles">
|
<Directory Id="INSTALLDIR_PROFILES" Name="profiles">
|
||||||
<Component Id="cyberflex.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
<Component Id="cyberflex.profile" Guid="*" Win64="$(var.Win64YesNo)">
|
||||||
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\cyberflex.profile"/>
|
<File Source="$(var.SOURCE_DIR)\src\pkcs15init\cyberflex.profile"/>
|
||||||
@ -284,8 +292,12 @@
|
|||||||
<Feature Id="Complete" Level="1" Title="OpenSC software suite" Display="expand">
|
<Feature Id="Complete" Level="1" Title="OpenSC software suite" Display="expand">
|
||||||
<Feature Id="OpenSC_core" Level="1" Title="OpenSC core library" Description="Core DLL and configuration file used by all other components." Absent="disallow">
|
<Feature Id="OpenSC_core" Level="1" Title="OpenSC core library" Description="Core DLL and configuration file used by all other components." Absent="disallow">
|
||||||
<ComponentRef Id="opensc.dll"/>
|
<ComponentRef Id="opensc.dll"/>
|
||||||
|
<?ifdef zlib ?>
|
||||||
|
<ComponentRef Id="zlib1.dll"/>
|
||||||
|
<?endif ?>
|
||||||
<ComponentRef Id="opensc.conf"/>
|
<ComponentRef Id="opensc.conf"/>
|
||||||
<?ifndef Light ?>
|
<?ifdef OpenSSL ?>
|
||||||
|
<ComponentRef Id="libeay32.dll"/>
|
||||||
<ComponentRef Id="smm_local.dll"/>
|
<ComponentRef Id="smm_local.dll"/>
|
||||||
<?endif ?>
|
<?endif ?>
|
||||||
</Feature>
|
</Feature>
|
||||||
@ -311,7 +323,7 @@
|
|||||||
<ComponentRef Id="pkcs15_crypt.exe"/>
|
<ComponentRef Id="pkcs15_crypt.exe"/>
|
||||||
<ComponentRef Id="openpgp_tool.exe"/>
|
<ComponentRef Id="openpgp_tool.exe"/>
|
||||||
<ComponentRef Id="iasecc_tool.exe"/>
|
<ComponentRef Id="iasecc_tool.exe"/>
|
||||||
<?ifndef Light ?>
|
<?ifdef OpenSSL ?>
|
||||||
<ComponentRef Id="cryptoflex_tool.exe"/>
|
<ComponentRef Id="cryptoflex_tool.exe"/>
|
||||||
<ComponentRef Id="pkcs15_init.exe"/>
|
<ComponentRef Id="pkcs15_init.exe"/>
|
||||||
<ComponentRef Id="netkey_tool.exe"/>
|
<ComponentRef Id="netkey_tool.exe"/>
|
||||||
|
Loading…
Reference in New Issue
Block a user