VivoKey/vsmartcard
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

moved include of ws2_32 to the appropriate place

Browse Source 
git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@732 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
frankmorgner
2012-04-05 22:34:41 +00:00
parent 4c2849c4f4
commit ed6062b228
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
npa/Makefile.am
View File

@@ -52,7 +52,6 @@ $(opensc_root)/lib/libnpa.la: $(opensc_root)/lib/libopensc.la
--host=i586-mingw32msvc \
--build=$(shell gcc -dumpmachine) \
--program-prefix='' \
LIBS="-lws2_32" \
PKG_CONFIG_PATH="$(opensc_root)/lib/pkgconfig" \
PKG_CONFIG_SYSROOT_DIR="$(opensc_root)" \
OPENSC_LIBS="-L$(opensc_root)/lib -lopensc" || ($(restore_la) && false)

3
npa/src/Makefile.am
View File

@@ -6,6 +6,9 @@ libnpa_la_SOURCES = sm.c scutil.c npa.c sslutil.c
libnpa_la_LIBADD = $(OPENSSL_LIBS) $(OPENSC_LIBS)
libnpa_la_CFLAGS = $(OPENSSL_CFLAGS)
libnpa_la_LDFLAGS = -no-undefined
if WIN32
libnpa_la_LIBADD += -lws2_32
endif
npa_tool_SOURCES = npa-tool.c binutil.c
npa_tool_LDADD = $(OPENSSL_LIBS) $(OPENSC_LIBS) libnpa.la