More MSVC fixups by Douglas E. Engert
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3503 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
parent
e928d5565c
commit
6c740b907e
@ -36,7 +36,7 @@ OBJECTS = \
|
|||||||
compression.obj p15card-helper.obj \
|
compression.obj p15card-helper.obj \
|
||||||
versioninfo.res
|
versioninfo.res
|
||||||
|
|
||||||
all: install-headers $(TARGET)
|
all: versioninfo.res install-headers $(TARGET)
|
||||||
|
|
||||||
!INCLUDE $(TOPDIR)\win32\Make.rules.mak
|
!INCLUDE $(TOPDIR)\win32\Make.rules.mak
|
||||||
|
|
||||||
|
@ -13,8 +13,8 @@ OBJECTS = pkcs11-global.obj pkcs11-session.obj pkcs11-object.obj misc.obj slot
|
|||||||
mechanism.obj openssl.obj secretkey.obj framework-pkcs15.obj \
|
mechanism.obj openssl.obj secretkey.obj framework-pkcs15.obj \
|
||||||
framework-pkcs15init.obj debug.obj \
|
framework-pkcs15init.obj debug.obj \
|
||||||
versioninfo.res
|
versioninfo.res
|
||||||
OBJECTS2 = libpkcs11.obj
|
OBJECTS2 = libpkcs11.obj versioninfo.res
|
||||||
OBJECTS3 = pkcs11-spy.obj pkcs11-display.obj libpkcs11.obj
|
OBJECTS3 = pkcs11-spy.obj pkcs11-display.obj libpkcs11.obj versioninfo.res
|
||||||
|
|
||||||
all: install-headers $(TARGET0) $(TARGET) $(TARGET2) $(TARGET3)
|
all: install-headers $(TARGET0) $(TARGET) $(TARGET2) $(TARGET3)
|
||||||
|
|
||||||
@ -24,7 +24,7 @@ $(TARGET0): $(OBJECTS) hack-enabled.obj ..\libopensc\opensc.lib ..\scconf\scconf
|
|||||||
echo LIBRARY $* > $*.def
|
echo LIBRARY $* > $*.def
|
||||||
echo EXPORTS >> $*.def
|
echo EXPORTS >> $*.def
|
||||||
type opensc-pkcs11.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
|
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
|
||||||
|
@ -9,9 +9,10 @@ OBJECTS = pkcs15-lib.obj profile.obj keycache.obj \
|
|||||||
pkcs15-gpk.obj pkcs15-miocos.obj pkcs15-cflex.obj \
|
pkcs15-gpk.obj pkcs15-miocos.obj pkcs15-cflex.obj \
|
||||||
pkcs15-cardos.obj pkcs15-jcop.obj pkcs15-starcos.obj \
|
pkcs15-cardos.obj pkcs15-jcop.obj pkcs15-starcos.obj \
|
||||||
pkcs15-oberthur.obj pkcs15-setcos.obj pkcs15-incrypto34.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
|
!INCLUDE $(TOPDIR)\win32\Make.rules.mak
|
||||||
|
|
||||||
|
@ -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
|
EXTRA_DIST = Makefile.mak
|
||||||
|
|
||||||
SUBDIRS = regression
|
SUBDIRS = regression
|
||||||
@ -16,3 +20,17 @@ lottery_SOURCES = lottery.c $(COMMON_SRC) $(COMMON_INC)
|
|||||||
p15dump_SOURCES = p15dump.c print.c $(COMMON_SRC) $(COMMON_INC)
|
p15dump_SOURCES = p15dump.c print.c $(COMMON_SRC) $(COMMON_INC)
|
||||||
pintest_SOURCES = pintest.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)
|
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 Program/g' \
|
||||||
|
"$(top_builddir)/win32/versioninfo.rc.in" > versioninfo.rc
|
||||||
|
@ -6,6 +6,9 @@ TARGETS = base64.exe p15dump.exe \
|
|||||||
|
|
||||||
all: print.obj sc-test.obj $(TARGETS)
|
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
|
!INCLUDE $(TOPDIR)\win32\Make.rules.mak
|
||||||
|
|
||||||
.c.obj:
|
.c.obj:
|
||||||
|
@ -5,9 +5,12 @@ TOPDIR = ..\..
|
|||||||
|
|
||||||
TARGETS = opensc-tool.exe opensc-explorer.exe pkcs15-tool.exe pkcs15-crypt.exe \
|
TARGETS = opensc-tool.exe opensc-explorer.exe pkcs15-tool.exe pkcs15-crypt.exe \
|
||||||
pkcs11-tool.exe cardos-info.exe eidenv.exe rutoken-tool.exe \
|
pkcs11-tool.exe cardos-info.exe eidenv.exe rutoken-tool.exe \
|
||||||
|
netkey-tool.exe \
|
||||||
$(PROGRAMS_OPENSSL)
|
$(PROGRAMS_OPENSSL)
|
||||||
|
|
||||||
all: util.obj $(TARGETS)
|
all: $(TARGETS)
|
||||||
|
|
||||||
|
$(TARGETS): versioninfo.res util.obj
|
||||||
|
|
||||||
.c.obj:
|
.c.obj:
|
||||||
cl $(COPTS) /c $<
|
cl $(COPTS) /c $<
|
||||||
@ -19,11 +22,3 @@ all: util.obj $(TARGETS)
|
|||||||
..\pkcs15init\pkcs15init.lib ..\pkcs11\libpkcs11.lib \
|
..\pkcs15init\pkcs15init.lib ..\pkcs11\libpkcs11.lib \
|
||||||
versioninfo.res $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib
|
versioninfo.res $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib
|
||||||
if EXIST $@.manifest mt -manifest $@.manifest -outputresource:$@;1
|
if EXIST $@.manifest mt -manifest $@.manifest -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
|
|
||||||
|
@ -37,7 +37,7 @@ OPENSC_FEATURES = $(OPENSC_FEATURES) zlib
|
|||||||
!ENDIF
|
!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
|
LINKFLAGS = /DEBUG /NOLOGO /INCREMENTAL:NO /MACHINE:IX86
|
||||||
|
|
||||||
|
|
||||||
@ -53,7 +53,7 @@ install-headers-dir:
|
|||||||
cl $(COPTS) /c $<
|
cl $(COPTS) /c $<
|
||||||
|
|
||||||
.rc.res::
|
.rc.res::
|
||||||
rc /l 0x809 /r /fo"$*.res" $<
|
rc /l 0x0409 /r $<
|
||||||
|
|
||||||
clean::
|
clean::
|
||||||
del /Q *.obj *.dll *.exe *.pdb *.lib *.exp *.def
|
del /Q *.obj *.dll *.exe *.pdb *.lib *.exp *.def
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
/* This file is processed by configure to create versioninfo.rc */
|
/* This file is processed by configure to create versioninfo.rc */
|
||||||
/* Every component changes @@FILE_DESCRIPTION@@ to local string */
|
/* Every component changes @@FILE_DESCRIPTION@@ to local string */
|
||||||
|
|
||||||
|
#include <winresrc.h>
|
||||||
|
|
||||||
VS_VERSION_INFO VERSIONINFO
|
VS_VERSION_INFO VERSIONINFO
|
||||||
FILEVERSION @OPENSC_LT_CURRENT@,@OPENSC_LT_AGE@,@OPENSC_LT_REVISION@,0
|
FILEVERSION @OPENSC_LT_CURRENT@,@OPENSC_LT_AGE@,@OPENSC_LT_REVISION@,0
|
||||||
PRODUCTVERSION @OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,0
|
PRODUCTVERSION @OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,0
|
||||||
|
Loading…
Reference in New Issue
Block a user