From 5f567f7a3c5b3f62228fd1e706c6051dc6b2bef3 Mon Sep 17 00:00:00 2001 From: alonbl Date: Mon, 7 Apr 2008 21:35:11 +0000 Subject: [PATCH] More MSVC build additions (1) use the exports for opensc-pkcs11.dll, onepin-opensc-pkcs11.dll, and pkcs11-spy.dll (2) don't link common.lib with scconf.lib, to avoid duplicate messages later. (3) add piv-tool to openssl_programs. By Douglas E. Engert git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3466 c6295689-39f2-0310-b995-f0e70906c6a9 --- src/pkcs11/Makefile.mak | 15 ++++++++++++--- src/scconf/Makefile.mak | 4 ++-- win32/Make.rules.mak | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/pkcs11/Makefile.mak b/src/pkcs11/Makefile.mak index b3f8af63..c859d7ce 100644 --- a/src/pkcs11/Makefile.mak +++ b/src/pkcs11/Makefile.mak @@ -21,16 +21,25 @@ all: install-headers $(TARGET0) $(TARGET) $(TARGET2) $(TARGET3) !INCLUDE $(TOPDIR)\win32\Make.rules.mak $(TARGET0): $(OBJECTS) hack-enabled.obj ..\libopensc\opensc.lib ..\scconf\scconf.lib ..\pkcs15init\pkcs15init.lib ..\common\common.lib - link $(LINKFLAGS) /dll /out:$(TARGET) $(OBJECTS) hack-enabled.obj ..\libopensc\opensc.lib ..\scconf\scconf.lib ..\pkcs15init\pkcs15init.lib ..\common\common.lib winscard.lib $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib + echo LIBRARY $* > $*.def + echo EXPORTS >> $*.def + type opensc-pkcs11.exports >> $*.def + link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET) $(OBJECTS) hack-enabled.obj ..\libopensc\opensc.lib ..\scconf\scconf.lib ..\pkcs15init\pkcs15init.lib ..\common\common.lib winscard.lib $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib if EXIST $(TARGET).manifest mt -manifest $(TARGET).manifest -outputresource:$(TARGET);2 $(TARGET): $(OBJECTS) hack-disabled.obj ..\libopensc\opensc.lib ..\scconf\scconf.lib ..\pkcs15init\pkcs15init.lib ..\common\common.lib - link $(LINKFLAGS) /dll /out:$(TARGET) $(OBJECTS) hack-disabled.obj ..\libopensc\opensc.lib ..\scconf\scconf.lib ..\pkcs15init\pkcs15init.lib ..\common\common.lib winscard.lib $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib + echo LIBRARY $* > $*.def + echo EXPORTS >> $*.def + type $*.exports >> $*.def + link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET) $(OBJECTS) hack-disabled.obj ..\libopensc\opensc.lib ..\scconf\scconf.lib ..\pkcs15init\pkcs15init.lib ..\common\common.lib winscard.lib $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib if EXIST $(TARGET).manifest mt -manifest $(TARGET).manifest -outputresource:$(TARGET);2 $(TARGET2): $(OBJECTS2) lib /nologo /machine:ix86 /out:$(TARGET2) $(OBJECTS2) $(LIBLTDL_LIB) $(TARGET3): $(OBJECTS3) ..\libopensc\opensc.lib - link $(LINKFLAGS) /dll /out:$(TARGET3) $(OBJECTS3) ..\libopensc\opensc.lib $(OPENSSL_LIB) $(LIBLTDL_LIB) gdi32.lib advapi32.lib + echo LIBRARY $* > $*.def + echo EXPORTS >> $*.def + type $*.exports >> $*.def + link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET3) $(OBJECTS3) ..\libopensc\opensc.lib $(OPENSSL_LIB) $(LIBLTDL_LIB) gdi32.lib advapi32.lib if EXIST $(TARGET3).manifest mt -manifest $(TARGET3).manifest -outputresource:$(TARGET3);2 diff --git a/src/scconf/Makefile.mak b/src/scconf/Makefile.mak index a1a5bcee..0f2e6d02 100644 --- a/src/scconf/Makefile.mak +++ b/src/scconf/Makefile.mak @@ -9,7 +9,7 @@ OBJECTS = scconf.obj parse.obj write.obj sclex.obj all: install-headers $(TARGET) -$(TARGET): $(OBJECTS) ..\common\common.lib - lib /nologo /machine:ix86 /out:$(TARGET) $(OBJECTS) ..\common\common.lib +$(TARGET): $(OBJECTS) + lib /nologo /machine:ix86 /out:$(TARGET) $(OBJECTS) !INCLUDE $(TOPDIR)\win32\Make.rules.mak diff --git a/win32/Make.rules.mak b/win32/Make.rules.mak index 1b2a2692..d6bfaa27 100644 --- a/win32/Make.rules.mak +++ b/win32/Make.rules.mak @@ -20,7 +20,7 @@ OPENSC_FEATURES = pcsc !IF "$(OPENSSL_DEF)" == "/DENABLE_OPENSSL" OPENSSL_INCL_DIR = /IC:\openssl\include OPENSSL_LIB = C:\openssl\out32dll\libeay32.lib -PROGRAMS_OPENSSL = pkcs15-init.exe cryptoflex-tool.exe netkey-tool.exe +PROGRAMS_OPENSSL = pkcs15-init.exe cryptoflex-tool.exe netkey-tool.exe piv-tool.exe OPENSC_FEATURES = $(OPENSC_FEATURES) openssl !ENDIF