diff --git a/win32/Make.rules.mak b/win32/Make.rules.mak index 6a44bb77..b85af555 100644 --- a/win32/Make.rules.mak +++ b/win32/Make.rules.mak @@ -1,36 +1,21 @@ OPENSC_FEATURES = pcsc -#Uncomment to use 'static' linking mode -LINK_MODE = STATIC - #Include support of minidriver 'cardmod' MINIDRIVER_DEF = /DENABLE_CARDMOD -#Build MSI with the Windows Installer XML (WIX), minimal WIX version 3.6 -WIX_INSTALLED_PATH = "C:\Program Files\Windows Installer XML v3.6" +#Build MSI with the Windows Installer XML (WIX) toolkit, requires WIX >= 3.6 +WIX_PATH = "C:\Program Files\Windows Installer XML v3.6" -#Static link mode should be used. -#WIX_MSI_DEF = /DBUILD_MSI -!IF "$(WIX_MSI_DEF)" == "/DBUILD_MSI" -LINK_MODE = STATIC -!ENDIF # If you want support for OpenSSL (needed for pkcs15-init tool, software hashing in PKCS#11 library and verification): # - download and build OpenSSL # - uncomment the line starting with OPENSSL_DEF # - set the OPENSSL_INCL_DIR below to your openssl include directory, preceded by "/I" # - set the OPENSSL_LIB below to your openssl lib file -#OPENSSL_DEF = /DENABLE_OPENSSL +OPENSSL_DEF = /DENABLE_OPENSSL !IF "$(OPENSSL_DEF)" == "/DENABLE_OPENSSL" -OPENSSL_INCL_DIR = /IC:\openssl\include - -!IF "$(LINK_MODE)" != "STATIC" -OPENSSL_LIB = C:\openssl\out32dll\libeay32.lib -#OPENSSL_LIB = C:\openssl\lib\VC\libeay32MD.lib C:\openssl\lib\VC\ssleay32MD.lib user32.lib advapi32.lib -!ENDIF -!IF "$(LINK_MODE)" == "STATIC" -#OPENSSL_LIB = C:\openssl\lib\VC\static\libeay32MT.lib C:\openssl\lib\VC\static\ssleay32MT.lib user32.lib advapi32.lib -!ENDIF +OPENSSL_INCL_DIR = /IC:\OpenSSL-Win32\include +OPENSSL_LIB = C:\OpenSSL-Win32\lib\VC\static\libeay32MT.lib C:\OpenSSL-Win32\lib\VC\static\ssleay32MT.lib user32.lib advapi32.lib PROGRAMS_OPENSSL = pkcs15-init.exe cryptoflex-tool.exe netkey-tool.exe piv-tool.exe westcos-tool.exe OPENSC_FEATURES = $(OPENSC_FEATURES) openssl @@ -57,21 +42,14 @@ CNGSDK_INCL_DIR = "/IC:\Program Files\Microsoft CNG Development Kit\Include" # INTTYPES_INCL_DIR = /IC:\opensc\dependencies\msys\local ALL_INCLUDES = /I$(TOPDIR)\win32 /I$(TOPDIR)\src $(OPENSSL_INCL_DIR) $(ZLIB_INCL_DIR) $(LIBLTDL_INCL) $(INTTYPES_INCL_DIR) $(CNGSDK_INCL_DIR) -!IF "$(LINK_MODE)" != "STATIC" -COPTS = /D_CRT_SECURE_NO_DEPRECATE /Zi /MD /nologo /DHAVE_CONFIG_H $(ALL_INCLUDES) /D_WIN32_WINNT=0x0502 /DWIN32_LEAN_AND_MEAN $(OPENSSL_DEF) $(ZLIB_DEF) $(MINIDRIVER_DEF) /DOPENSC_FEATURES="\"$(OPENSC_FEATURES)\"" -LINKFLAGS = /DEBUG /NOLOGO /INCREMENTAL:NO /MACHINE:IX86 -!ENDIF - -!IF "$(LINK_MODE)" == "STATIC" COPTS = /D_CRT_SECURE_NO_DEPRECATE /MT /nologo /DHAVE_CONFIG_H $(ALL_INCLUDES) /D_WIN32_WINNT=0x0502 /DWIN32_LEAN_AND_MEAN $(OPENSSL_DEF) $(ZLIB_DEF) $(MINIDRIVER_DEF) /DOPENSC_FEATURES="\"$(OPENSC_FEATURES)\"" -LINKFLAGS = /NOLOGO /INCREMENTAL:NO /MACHINE:IX86 /MANIFEST:NO /NODEFAULTLIB:MSVCRTD /NODEFAULTLIB:MSVCRT /NODEFAULTLIB:LIBCMTD -!ENDIF +LINKFLAGS = /NOLOGO /INCREMENTAL:NO /MACHINE:IX86 /MANIFEST:NO /NODEFAULTLIB:MSVCRTD /NODEFAULTLIB:MSVCRT /NODEFAULTLIB:LIBCMTD .c.obj:: cl $(COPTS) /c $< .rc.res:: - rc /l 0x0409 /r $< + rc /l 0x0409 $< clean:: del /Q *.obj *.dll *.exe *.pdb *.lib *.def *.manifest diff --git a/win32/Makefile.mak b/win32/Makefile.mak index f26c570d..efcb0918 100644 --- a/win32/Makefile.mak +++ b/win32/Makefile.mak @@ -8,10 +8,10 @@ config.h: winconfig.h @copy /y winconfig.h config.h OpenSC.msi: OpenSC.wixobj - $(WIX_INSTALLED_PATH)\bin\light.exe -sh -ext WixUIExtension $? + $(WIX_PATH)\bin\light.exe -sh -ext WixUIExtension $? OpenSC.wixobj: OpenSC.wxs - $(WIX_INSTALLED_PATH)\bin\candle.exe -dSOURCE_DIR=$(TOPDIR) $? + $(WIX_PATH)\bin\candle.exe -dSOURCE_DIR=$(TOPDIR) $? clean:: del /Q config.h *.msi *.wixobj *.wixpdb diff --git a/win32/opensc-msi/Make.rules.mak.works-for-vt b/win32/opensc-msi/Make.rules.mak.works-for-vt deleted file mode 100644 index 187cb122..00000000 --- a/win32/opensc-msi/Make.rules.mak.works-for-vt +++ /dev/null @@ -1,93 +0,0 @@ -# Note: these instructions obsolete the instructions in opensc.html - -# You first need to download the gnuwin32 libtool (e.g. the "Binaries" and "Developer -# files" from http://gnuwin32.sourceforge.net/packages/libtool.htm) -# Then fill in the directory path to ltdl.h on the LIBLTDL_INCL line below, preceeded -# by an "/I"; and fill in the path to the libltdl.lib on the LIBLTDL_LIB line below. -# Then you can build this OpenSC package; and afterwards you'll need to copy the -# libltdl3.dll somewhere on your execution path. -#LIBLTDL_INCL = # E.g. /IC:\libtool-1.5.8-lib\include -#LIBLTDL_LIB = # E.g. C:\libtool-1.5.8-lib\lib\libltdl.lib -LIBLTDL_INCL = /IC:\opensc\dependencies\libtool\include -LIBLTDL_LIB = C:\opensc\dependencies\libtool\lib\ltdl.lib -LIBLTDL_DLL = C:\opensc\dependencies\libtool\bin\libltdl3.dll - -OPENSC_FEATURES = pcsc - -#Uncomment to use 'static' linking mode -#LINK_MODE = STATIC - -#Include support of minidriver 'cardmon' -#MINIDRIVER_DEF = /DENABLE_MINIDRIVER - - -#Build MSI with the Windows Installer XML (WIX), minimal WIX version 3.6 -#Static link mode should be used. -WIX_MSI_DEF = /DBUILD_MSI -!IF "$(WIX_MSI_DEF)" == "/DBUILD_MSI" -WIX_INSTALLED_PATH = c:\download\wix36-binaries -LINK_MODE = STATIC -!ENDIF - - -# If you want support for OpenSSL (needed for a.o. pkcs15-init tool and openssl engine): -# - download and build OpenSSL -# - uncomment the line starting with OPENSSL_DEF -# - set the OPENSSL_INCL_DIR below to your openssl include directory, preceded by "/I" -# - set the OPENSSL_LIB below to your openssl lib file -OPENSSL_DEF = /DENABLE_OPENSSL -!IF "$(OPENSSL_DEF)" == "/DENABLE_OPENSSL" -#OPENSSL_INCL_DIR = /IC:\openssl\include -OPENSSL_INCL_DIR = /IC:\opensc\dependencies\openssl\include - -!IF "$(LINK_MODE)" != "STATIC" -#OPENSSL_LIB = C:\openssl\out32dll\libeay32.lib -OPENSSL_LIB = C:\opensc\dependencies\openssl\lib\VC\libeay32MD.lib C:\opensc\dependencies\openssl\lib\VC\ssleay32MD.lib user32.lib advapi32.lib -#OPENSSL_LIB = C:\opensc\dependencies\openssl\lib\VC\static\libeay32MD.lib C:\opensc\dependencies\openssl\lib\VC\static\ssleay32MD.lib user32.lib advapi32.lib -!ENDIF -!IF "$(LINK_MODE)" == "STATIC" -OPENSSL_LIB = C:\opensc\dependencies\openssl\lib\VC\static\libeay32MT.lib C:\opensc\dependencies\openssl\lib\VC\static\ssleay32MT.lib user32.lib advapi32.lib -!ENDIF - -PROGRAMS_OPENSSL = pkcs15-init.exe cryptoflex-tool.exe netkey-tool.exe piv-tool.exe westcos-tool.exe -OPENSC_FEATURES = $(OPENSC_FEATURES) openssl -!ENDIF - - -# If you want support for zlib (Used for PIV, infocamere and actalis): -# - Download zlib and build -# - uncomment the line starting with ZLIB_DEF -# - set the ZLIB_INCL_DIR below to the zlib include lib proceeded by "/I" -# - set the ZLIB_LIB below to your zlib lib file -#ZLIB_DEF = /DENABLE_ZLIB -!IF "$(ZLIB_DEF)" == "/DENABLE_ZLIB" -#ZLIB_INCL_DIR = /IC:\ZLIB\INCLUDE -ZLIB_INCL_DIR = /IC:\opensc\dependencies\zlib\include -#ZLIB_LIB = C:\ZLIB\LIB\zlib.lib -ZLIB_LIB = C:\opensc\dependencies\zlib\lib\zlib.lib -OPENSC_FEATURES = $(OPENSC_FEATURES) zlib -!ENDIF - - -# 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 - -!IF "$(LINK_MODE)" != "STATIC" -COPTS = /D_CRT_SECURE_NO_DEPRECATE /Zi /MD /nologo /DHAVE_CONFIG_H /I$(TOPDIR)\win32 /I$(TOPDIR)\src $(OPENSSL_INCL_DIR) $(ZLIB_INCL_DIR) $(LIBLTDL_INCL) $(INTTYPES_INCL_DIR) /D_WIN32_WINNT=0x0400 /DWIN32_LEAN_AND_MEAN $(OPENSSL_DEF) $(ZLIB_DEF) /DOPENSC_FEATURES="\"$(OPENSC_FEATURES)\"" -LINKFLAGS = /DEBUG /NOLOGO /INCREMENTAL:NO /MACHINE:IX86 -!ENDIF - -!IF "$(LINK_MODE)" == "STATIC" -COPTS = /D_CRT_SECURE_NO_DEPRECATE /MT /nologo /DHAVE_CONFIG_H /I$(TOPDIR)\win32 /I$(TOPDIR)\src /I$(TOPDIR)\src\common $(OPENSSL_INCL_DIR) $(ZLIB_INCL_DIR) $(LIBLTDL_INCL) $(INTTYPES_INCL_DIR) /D_WIN32_WINNT=0x0400 /DWIN32_LEAN_AND_MEAN $(OPENSSL_DEF) $(ZLIB_DEF) /DOPENSC_FEATURES="\"$(OPENSC_FEATURES)\"" -LINKFLAGS = /NOLOGO /INCREMENTAL:NO /MACHINE:IX86 /MANIFEST:NO /NODEFAULTLIB:MSVCRTD /NODEFAULTLIB:MSVCRT /NODEFAULTLIB:LIBCMTD -!ENDIF - -.c.obj:: - cl $(COPTS) /c $< - -.rc.res:: - rc /l 0x0409 /r $< - -clean:: - del /Q *.obj *.dll *.exe *.pdb *.lib *.def *.manifest diff --git a/win32/opensc-msi/Makefile.mak b/win32/opensc-msi/Makefile.mak deleted file mode 100644 index e38474ec..00000000 --- a/win32/opensc-msi/Makefile.mak +++ /dev/null @@ -1,17 +0,0 @@ -TOPDIR = ..\..\.. - -TARGET = OpenSC.msi - -all: $(TARGET) - -!INCLUDE $(TOPDIR)\win32\Make.rules.mak - -OpenSC.msi: OpenSC.wixobj - $(WIX_INSTALLED_PATH)\light.exe -sh -ext WixUIExtension $? - -OpenSC.wixobj: OpenSC.wxs - $(WIX_INSTALLED_PATH)\candle.exe -dSOURCE_DIR=$(TOPDIR) $? - -clean:: - del /Q *.msi *.wixobj *.wixpdb - diff --git a/win32/opensc-msi/README b/win32/opensc-msi/README deleted file mode 100755 index eb1514ea..00000000 --- a/win32/opensc-msi/README +++ /dev/null @@ -1,5 +0,0 @@ -Tested with WIX version 3.6.0917.0 - -To create MSI: -# wix\candle.exe -dSOURCE_DIR= -dPATH_TO_LIBLTD3_DLL= OpenSC.wxs -# wix\light.exe -sh -ext WixUIExtension OpenSC.wixobj