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
This commit is contained in:
parent
f9347111db
commit
5f567f7a3c
@ -21,16 +21,25 @@ all: install-headers $(TARGET0) $(TARGET) $(TARGET2) $(TARGET3)
|
|||||||
!INCLUDE $(TOPDIR)\win32\Make.rules.mak
|
!INCLUDE $(TOPDIR)\win32\Make.rules.mak
|
||||||
|
|
||||||
$(TARGET0): $(OBJECTS) hack-enabled.obj ..\libopensc\opensc.lib ..\scconf\scconf.lib ..\pkcs15init\pkcs15init.lib ..\common\common.lib
|
$(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
|
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
|
$(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
|
if EXIST $(TARGET).manifest mt -manifest $(TARGET).manifest -outputresource:$(TARGET);2
|
||||||
|
|
||||||
$(TARGET2): $(OBJECTS2)
|
$(TARGET2): $(OBJECTS2)
|
||||||
lib /nologo /machine:ix86 /out:$(TARGET2) $(OBJECTS2) $(LIBLTDL_LIB)
|
lib /nologo /machine:ix86 /out:$(TARGET2) $(OBJECTS2) $(LIBLTDL_LIB)
|
||||||
|
|
||||||
$(TARGET3): $(OBJECTS3) ..\libopensc\opensc.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
|
if EXIST $(TARGET3).manifest mt -manifest $(TARGET3).manifest -outputresource:$(TARGET3);2
|
||||||
|
@ -9,7 +9,7 @@ OBJECTS = scconf.obj parse.obj write.obj sclex.obj
|
|||||||
|
|
||||||
all: install-headers $(TARGET)
|
all: install-headers $(TARGET)
|
||||||
|
|
||||||
$(TARGET): $(OBJECTS) ..\common\common.lib
|
$(TARGET): $(OBJECTS)
|
||||||
lib /nologo /machine:ix86 /out:$(TARGET) $(OBJECTS) ..\common\common.lib
|
lib /nologo /machine:ix86 /out:$(TARGET) $(OBJECTS)
|
||||||
|
|
||||||
!INCLUDE $(TOPDIR)\win32\Make.rules.mak
|
!INCLUDE $(TOPDIR)\win32\Make.rules.mak
|
||||||
|
@ -20,7 +20,7 @@ OPENSC_FEATURES = pcsc
|
|||||||
!IF "$(OPENSSL_DEF)" == "/DENABLE_OPENSSL"
|
!IF "$(OPENSSL_DEF)" == "/DENABLE_OPENSSL"
|
||||||
OPENSSL_INCL_DIR = /IC:\openssl\include
|
OPENSSL_INCL_DIR = /IC:\openssl\include
|
||||||
OPENSSL_LIB = C:\openssl\out32dll\libeay32.lib
|
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
|
OPENSC_FEATURES = $(OPENSC_FEATURES) openssl
|
||||||
!ENDIF
|
!ENDIF
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user