Skip to content

Commit

Permalink
libopensc: Unbreak build with mingw
Browse files Browse the repository at this point in the history
Related to #2294
  • Loading branch information
Jakuje committed Sep 8, 2021
1 parent f0afd17 commit a00ead5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/libopensc/Makefile.am
Expand Up @@ -87,7 +87,7 @@ libopensc_la_LIBADD = $(OPENPACE_LIBS) $(OPTIONAL_OPENSSL_LIBS) \
$(top_builddir)/src/sm/libsmeac.la \
$(top_builddir)/src/common/libcompat.la
if WIN32
libopensc_la_LIBADD += -lws2_32
libopensc_la_LIBADD += -lws2_32 -lshlwapi
endif
libopensc_static_la_LIBADD = $(libopensc_la_LIBADD)
libopensc_la_LDFLAGS = $(AM_LDFLAGS) \
Expand Down
4 changes: 4 additions & 0 deletions src/pkcs11/Makefile.am
Expand Up @@ -23,6 +23,9 @@ OPENSC_PKCS11_LIBS = \
$(top_builddir)/src/common/libscdl.la \
$(top_builddir)/src/common/libcompat.la \
$(OPENPACE_LIBS) $(OPTIONAL_OPENSSL_LIBS) $(PTHREAD_LIBS)
if WIN32
OPENSC_PKCS11_LIBS += -lshlwapi
endif

pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = opensc-pkcs11.pc
Expand Down Expand Up @@ -61,6 +64,7 @@ pkcs11_spy_la_LDFLAGS = $(AM_LDFLAGS) \
if WIN32
opensc_pkcs11_la_SOURCES += versioninfo-pkcs11.rc
pkcs11_spy_la_SOURCES += versioninfo-pkcs11-spy.rc
pkcs11_spy_la_LIBADD += -lshlwapi
endif

if WIN32
Expand Down
1 change: 1 addition & 0 deletions src/tools/Makefile.am
Expand Up @@ -145,6 +145,7 @@ cmdline:
$(AM_V_GEN)$(GENGETOPT) --file-name=opensc-asn1-cmdline --output-dir=$(builddir) < opensc-asn1.ggo --unamed-opts

if WIN32
LIBS += -lshlwapi
opensc_tool_SOURCES += versioninfo-tools.rc
piv_tool_SOURCES += versioninfo-tools.rc
opensc_explorer_SOURCES += versioninfo-tools.rc
Expand Down

0 comments on commit a00ead5

Please sign in to comment.