Changeset 3466

Show
Ignore:
Timestamp:
04/07/08 23:35:11 (5 months ago)
Author:
alonbl
Message:

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

Location:
trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/pkcs11/Makefile.mak

    r3464 r3466  
    2222 
    2323$(TARGET0): $(OBJECTS) hack-enabled.obj ..\libopensc\opensc.lib ..\scconf\scconf.lib ..\pkcs15init\pkcs15init.lib ..\common\common.lib 
    24         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 
     24        echo LIBRARY $* > $*.def 
     25        echo EXPORTS >> $*.def 
     26        type opensc-pkcs11.exports >> $*.def 
     27        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 
    2528        if EXIST $(TARGET).manifest mt -manifest $(TARGET).manifest -outputresource:$(TARGET);2 
    2629 
    2730$(TARGET): $(OBJECTS) hack-disabled.obj ..\libopensc\opensc.lib ..\scconf\scconf.lib ..\pkcs15init\pkcs15init.lib ..\common\common.lib 
    28         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 
     31        echo LIBRARY $* > $*.def 
     32        echo EXPORTS >> $*.def 
     33        type $*.exports >> $*.def 
     34        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 
    2935        if EXIST $(TARGET).manifest mt -manifest $(TARGET).manifest -outputresource:$(TARGET);2 
    3036 
    … …  
    3339 
    3440$(TARGET3): $(OBJECTS3) ..\libopensc\opensc.lib 
    35         link $(LINKFLAGS) /dll /out:$(TARGET3) $(OBJECTS3) ..\libopensc\opensc.lib $(OPENSSL_LIB) $(LIBLTDL_LIB) gdi32.lib advapi32.lib 
     41        echo LIBRARY $* > $*.def 
     42        echo EXPORTS >> $*.def 
     43        type $*.exports >> $*.def 
     44        link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET3) $(OBJECTS3) ..\libopensc\opensc.lib $(OPENSSL_LIB) $(LIBLTDL_LIB) gdi32.lib advapi32.lib 
    3645        if EXIST $(TARGET3).manifest mt -manifest $(TARGET3).manifest -outputresource:$(TARGET3);2 

  • trunk/src/scconf/Makefile.mak

    r3464 r3466  
    1010all: install-headers $(TARGET) 
    1111 
    12 $(TARGET): $(OBJECTS) ..\common\common.lib 
    13         lib /nologo /machine:ix86 /out:$(TARGET) $(OBJECTS) ..\common\common.lib 
     12$(TARGET): $(OBJECTS) 
     13        lib /nologo /machine:ix86 /out:$(TARGET) $(OBJECTS) 
    1414 
    1515!INCLUDE $(TOPDIR)\win32\Make.rules.mak 

  • trunk/win32/Make.rules.mak

    r3465 r3466  
    2121OPENSSL_INCL_DIR = /IC:\openssl\include 
    2222OPENSSL_LIB = C:\openssl\out32dll\libeay32.lib 
    23 PROGRAMS_OPENSSL = pkcs15-init.exe cryptoflex-tool.exe netkey-tool.exe 
     23PROGRAMS_OPENSSL = pkcs15-init.exe cryptoflex-tool.exe netkey-tool.exe piv-tool.exe 
    2424OPENSC_FEATURES = $(OPENSC_FEATURES) openssl 
    2525!ENDIF