Attached are more changes to allow OpenSC to be built with the MSVC
tools and use the versioninfo These changes are mostly to the *.mak files.
But the change to the win32/versioninfo.rc.in.in adds
#include <winresrc.h>
Without this the Windows Explorer properties would not show the
"Version" tab. (mingw also provides a winresrc.h)
src/tests/Makefile.am was changed to create the versioninfo.rc
and include versioninfo.rc for the tests when building with mingw.
The win32/make.rules.mak uses US English rather then UK English,
to match the versioninfo.rc.in.in.
The rutoken code builds with out any problems.
--
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 3502)
+++ win32/Make.rules.mak (working copy)
@@ -37,7 +37,7 @@
!ENDIF
-COPTS = /D_CRT_SECURE_NO_DEPRECATE /Zi /MD /nologo /DHAVE_CONFIG_H
/I$(TOPDIR)\src\include /I$(TOPDIR)\src\include\opensc /I$(TOPDIR)\src\common
$(OPENSSL_INCL_DIR) $(ZLIB_INCL_DIR) $(LIBLTDL_INCL) /D_WIN32_WINNT=0x0400
/DWIN32_LEAN_AND_MEAN $(OPENSSL_DEF) $(ZLIB_DEF)
"/DOPENSC_FEATURES=$(OPENSC_FEATURES)"
+COPTS = /D_CRT_SECURE_NO_DEPRECATE /Zi /MD /nologo /DHAVE_CONFIG_H
/I$(TOPDIR)\src\include /I$(TOPDIR)\src\include\opensc /I$(TOPDIR)\src\common
$(OPENSSL_INCL_DIR) $(ZLIB_INCL_DIR) $(LIBLTDL_INCL) /D_WIN32_WINNT=0x0400
/DWIN32_LEAN_AND_MEAN $(OPENSSL_DEF) $(ZLIB_DEF)
/DOPENSC_FEATURES="\"$(OPENSC_FEATURES)\""
LINKFLAGS = /DEBUG /NOLOGO /INCREMENTAL:NO /MACHINE:IX86
@@ -53,7 +53,7 @@
cl $(COPTS) /c $<
.rc.res::
- rc /l 0x809 /r /fo"$*.res" $<
+ rc /l 0x0409 /r $<
clean::
del /Q *.obj *.dll *.exe *.pdb *.lib *.exp *.def
Index: win32/versioninfo.rc.in.in
===================================================================
--- win32/versioninfo.rc.in.in (revision 3502)
+++ win32/versioninfo.rc.in.in (working copy)
@@ -1,6 +1,8 @@
/* This file is processed by configure to create versioninfo.rc */
/* Every component changes @@FILE_DESCRIPTION@@ to local string */
+#include <winresrc.h>
+
VS_VERSION_INFO VERSIONINFO
FILEVERSION @OPENSC_LT_CURRENT@,@OPENSC_LT_AGE@,@OPENSC_LT_REVISION@,0
PRODUCTVERSION
@OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,0
Index: src/tools/Makefile.mak
===================================================================
--- src/tools/Makefile.mak (revision 3502)
+++ src/tools/Makefile.mak (working copy)
@@ -5,10 +5,13 @@
TARGETS = opensc-tool.exe opensc-explorer.exe pkcs15-tool.exe pkcs15-crypt.exe
\
pkcs11-tool.exe cardos-info.exe eidenv.exe rutoken-tool.exe \
+ netkey-tool.exe \
$(PROGRAMS_OPENSSL)
-all: util.obj $(TARGETS)
+all: $(TARGETS)
+$(TARGETS): versioninfo.res util.obj
+
.c.obj:
cl $(COPTS) /c $<
@@ -20,10 +23,10 @@
versioninfo.res $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib
if EXIST [EMAIL PROTECTED] mt -manifest [EMAIL PROTECTED]
-outputresource:$@;1
-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 \
- versioninfo.res $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib
- if EXIST netkey-tool.exe.manifest mt -manifest
netkey-tool.exe.manifest -outputresource:netkey-tool.exe;1
+#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 \
+# versioninfo.res $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib
+# if EXIST netkey-tool.exe.manifest mt -manifest
netkey-tool.exe.manifest -outputresource:netkey-tool.exe;1
Index: src/pkcs11/Makefile.mak
===================================================================
--- src/pkcs11/Makefile.mak (revision 3502)
+++ src/pkcs11/Makefile.mak (working copy)
@@ -13,8 +13,8 @@
mechanism.obj openssl.obj secretkey.obj
framework-pkcs15.obj \
framework-pkcs15init.obj debug.obj \
versioninfo.res
-OBJECTS2 = libpkcs11.obj
-OBJECTS3 = pkcs11-spy.obj pkcs11-display.obj libpkcs11.obj
+OBJECTS2 = libpkcs11.obj versioninfo.res
+OBJECTS3 = pkcs11-spy.obj pkcs11-display.obj libpkcs11.obj
versioninfo.res
all: install-headers $(TARGET0) $(TARGET) $(TARGET2) $(TARGET3)
@@ -24,7 +24,7 @@
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
+ link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET0)
$(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
Index: src/tests/Makefile.mak
===================================================================
--- src/tests/Makefile.mak (revision 3502)
+++ src/tests/Makefile.mak (working copy)
@@ -6,6 +6,9 @@
all: print.obj sc-test.obj $(TARGETS)
+$(TARGETS): versioninfo.res print.obj sc-test.obj \
+ ..\common\common.lib ..\libopensc\opensc.lib
+
!INCLUDE $(TOPDIR)\win32\Make.rules.mak
.c.obj:
Index: src/tests/Makefile.am
===================================================================
--- src/tests/Makefile.am (revision 3502)
+++ src/tests/Makefile.am (working copy)
@@ -1,4 +1,8 @@
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+include $(top_srcdir)/win32/ltrc.inc
+
+MAINTAINERCLEANFILES = \
+ $(srcdir)/Makefile.in $(srcdir)/versioninfo.rc
+CLEANFILES = versioninfo.rc
EXTRA_DIST = Makefile.mak
SUBDIRS = regression
@@ -16,3 +20,17 @@
p15dump_SOURCES = p15dump.c print.c $(COMMON_SRC) $(COMMON_INC)
pintest_SOURCES = pintest.c print.c $(COMMON_SRC) $(COMMON_INC)
prngtest_SOURCES = prngtest.c $(COMMON_SRC) $(COMMON_INC)
+
+if WIN32
+base64_SOURCES += versioninfo.rc
+lottery_SOURCES += versioninfo.rc
+p15dump_SOURCES += versioninfo.rc
+pintest_SOURCES += versioninfo.rc
+prngtest_SOURCES += versioninfo.rc
+else
+dist_noinst_DATA = versioninfo.rc
+endif
+
+versioninfo.rc:
+ sed 's/@@FILE_DESCRIPTION@@/OpenSC Test Programs/g' \
+ "$(top_builddir)/win32/versioninfo.rc.in" > versioninfo.rc
Index: src/pkcs15init/Makefile.mak
===================================================================
--- src/pkcs15init/Makefile.mak (revision 3502)
+++ src/pkcs15init/Makefile.mak (working copy)
@@ -9,9 +9,10 @@
pkcs15-gpk.obj pkcs15-miocos.obj pkcs15-cflex.obj \
pkcs15-cardos.obj pkcs15-jcop.obj pkcs15-starcos.obj \
pkcs15-oberthur.obj pkcs15-setcos.obj pkcs15-incrypto34.obj \
- pkcs15-muscle.obj pkcs15-asepcos.obj pkcs15-rutoken.obj
+ pkcs15-muscle.obj pkcs15-asepcos.obj pkcs15-rutoken.obj \
+ versioninfo.res
-all: install-headers $(TARGET)
+all: install-headers $(TARGET)
!INCLUDE $(TOPDIR)\win32\Make.rules.mak
Index: src/libopensc/Makefile.mak
===================================================================
--- src/libopensc/Makefile.mak (revision 3502)
+++ src/libopensc/Makefile.mak (working copy)
@@ -36,7 +36,7 @@
compression.obj p15card-helper.obj \
versioninfo.res
-all: install-headers $(TARGET)
+all: versioninfo.res install-headers $(TARGET)
!INCLUDE $(TOPDIR)\win32\Make.rules.mak
_______________________________________________
opensc-devel mailing list
opensc-devel@lists.opensc-project.org
http://www.opensc-project.org/mailman/listinfo/opensc-devel
