Changeset 2961 for releases

Timestamp:

05/23/06 12:03:17 (3 years ago)

Author:

aj

Message:

fix windows build of cryptoflex-tool and netkey-tool.

Location:

releases/opensc-0.11.1

Files:

• src/tools/Makefile.mak (modified) (2 diffs)
• win32/Make.rules.mak (modified) (1 diff)

releases/opensc-0.11.1/src/tools/Makefile.mak

@@ -4 +4 @@
 !INCLUDE $(TOPDIR)\win32\Make.rules.mak
 
-TARGETS = opensc-explorer.exe opensc-tool.exe \
-          piv-tool.exe \
-          pkcs15-tool.exe pkcs15-crypt.exe pkcs11-tool.exe cardos-info.exe eidenv.exe $(PKCS15_INIT) 
+TARGETS = opensc-tool.exe opensc-explorer.exe pkcs15-tool.exe pkcs15-crypt.exe \
+                piv-tool.exe pkcs11-tool.exe cardos-info.exe eidenv.exe \
+                $(PROGRAMS_OPENSSL)
 
 all: util.obj $(TARGETS)
@@ -19 +19 @@
         ..\pkcs15init\pkcs15init.lib ..\pkcs11\libpkcs11.lib \
         $(TOPDIR)\win32\version.res $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib
+
+netkey-tool.exe: netkey-tool.c
+        cl $(COPTS) /c netkey-tool.c
+        link $(LINKFLAGS) /pdb:netkey-tool.pdb /out:netkey-tool.exe netkey-tool.obj \
+        ..\common\common.lib ..\scconf\scconf.lib ..\libopensc\opensc.lib \
+        ..\pkcs15init\pkcs15init.lib ..\pkcs11\libpkcs11.lib \
+        $(TOPDIR)\win32\version.res $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib

releases/opensc-0.11.1/win32/Make.rules.mak

@@ -19 +19 @@
 OPENSSL_INCL_DIR = /IC:\openssl\include
 OPENSSL_LIB = C:\openssl\out32dll\libeay32.lib
-PKCS15_INIT = pkcs15-init.exe
+PROGRAMS_OPENSSL = pkcs15-init.exe cryptoflex-tool.exe netkey-tool.exe
 !ENDIF