From 4f266b6099afea8e08f3f6ce620ba89a5b6a5141 Mon Sep 17 00:00:00 2001 From: vtarasov Date: Thu, 17 Feb 2011 13:35:25 +0000 Subject: [PATCH] libopensc: include 'scdl' library when linking with Visual Studio ... missing 'scdl' header file in 'pkcs15-lib' git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5206 c6295689-39f2-0310-b995-f0e70906c6a9 --- src/libopensc/Makefile.mak | 4 ++-- src/pkcs15init/pkcs15-lib.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libopensc/Makefile.mak b/src/libopensc/Makefile.mak index 9bc8bf5b..00854b90 100644 --- a/src/libopensc/Makefile.mak +++ b/src/libopensc/Makefile.mak @@ -36,11 +36,11 @@ all: $(TOPDIR)\win32\versioninfo.res $(TARGET) !INCLUDE $(TOPDIR)\win32\Make.rules.mak -opensc.dll: $(OBJECTS) ..\scconf\scconf.lib ..\common\common.lib ..\pkcs15init\pkcs15init.lib +opensc.dll: $(OBJECTS) ..\scconf\scconf.lib ..\common\common.lib ..\common\libscdl.lib ..\pkcs15init\pkcs15init.lib echo LIBRARY $* > $*.def echo EXPORTS >> $*.def type lib$*.exports >> $*.def - link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:opensc.dll $(OBJECTS) ..\scconf\scconf.lib ..\common\common.lib ..\pkcs15init\pkcs15init.lib winscard.lib $(OPENSSL_LIB) $(ZLIB_LIB) gdi32.lib advapi32.lib ws2_32.lib + link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:opensc.dll $(OBJECTS) ..\scconf\scconf.lib ..\common\common.lib ..\common\libscdl.lib ..\pkcs15init\pkcs15init.lib winscard.lib $(OPENSSL_LIB) $(ZLIB_LIB) gdi32.lib advapi32.lib ws2_32.lib if EXIST opensc.dll.manifest mt -manifest opensc.dll.manifest -outputresource:opensc.dll;2 opensc_a.lib: $(OBJECTS) ..\scconf\scconf.lib ..\common\common.lib ..\pkcs15init\pkcs15init.lib diff --git a/src/pkcs15init/pkcs15-lib.c b/src/pkcs15init/pkcs15-lib.c index 56cd1365..e7b69de1 100644 --- a/src/pkcs15init/pkcs15-lib.c +++ b/src/pkcs15init/pkcs15-lib.c @@ -56,6 +56,7 @@ #endif #include "common/compat_strlcpy.h" +#include "common/libscdl.h" #include "libopensc/pkcs15.h" #include "libopensc/cardctl.h" #include "libopensc/log.h"