Attached changes to:
(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.
These all work with your changes below.
Alon Bar-Lev wrote:
On 4/7/08, Douglas E. Engert <[EMAIL PROTECTED]> wrote:
Attached are the latest mode to OpenSC svn 3462 to use the Makefile.mak
files to build on Windows.
Looks much better!
Index: src/include/winconfig.h
===================================================================
--- src/include/winconfig.h (revision 3462)
+++ src/include/winconfig.h (working copy)
+#define WIN32_LEAN_AND_MEAN
Moved to makefile.
+#define USE_WINDOWS_PCSC
Removed
/* src/common/getpass.c */
extern char *getpass(const char *prompt);
Removed.
Please find the source that requires this and add #include
<compat_getpass.h> to this source.
Also removed win32/makedef.pl
1. Why didn't you add .def file for the PKCS#11 providers?
2. libp11, engine_pkcs11 should also be fixed... :)
3. The version.rc is constant to all files... While at mingw build I
provide a better description...
4. I will make winconfig.h to be generated with correct sources.
Alon.
--
Douglas E. Engert <[EMAIL PROTECTED]>
Argonne National Laboratory
9700 South Cass Avenue
Argonne, Illinois 60439
(630) 252-5444
Index: win32/Make.rules.mak
===================================================================
--- win32/Make.rules.mak (revision 3464)
+++ win32/Make.rules.mak (working copy)
@@ -18,7 +18,7 @@
!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
!ENDIF
# If you want support for zlib (Used for PIV, infocamere and actalis:
Index: src/pkcs11/Makefile.mak
===================================================================
--- src/pkcs11/Makefile.mak (revision 3464)
+++ src/pkcs11/Makefile.mak (working copy)
@@ -21,16 +21,25 @@
!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
Index: src/scconf/Makefile.mak
===================================================================
--- src/scconf/Makefile.mak (revision 3464)
+++ src/scconf/Makefile.mak (working copy)
@@ -9,7 +9,7 @@
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
_______________________________________________
opensc-devel mailing list
[email protected]
http://www.opensc-project.org/mailman/listinfo/opensc-devel
