Allow static linking in mingw-cross-env. Added 'iconv' and uses 'ws2_32' instead of 'winsock32' (#3213487).
This commit is contained in:
parent
98b4d91d01
commit
674716438a
@ -1089,7 +1089,7 @@ def generateAutotools(target, source, env):
|
||||
vmime_pc_in.write("Description: " + packageDescription + "\n")
|
||||
vmime_pc_in.write("Version: @VERSION@\n")
|
||||
vmime_pc_in.write("Requires: @GSASL_REQUIRED@\n")
|
||||
vmime_pc_in.write("Libs: -L${libdir} -l@GENERIC_VERSIONED_LIBRARY_NAME@ @GSASL_LIBS@ @LIBGNUTLS_LIBS@ @VMIME_ADDITIONAL_PC_LIBS@\n")
|
||||
vmime_pc_in.write("Libs: -L${libdir} -l@GENERIC_VERSIONED_LIBRARY_NAME@ @GSASL_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @PTHREAD_LIBS@ @VMIME_ADDITIONAL_PC_LIBS@\n")
|
||||
#vmime_pc_in.write("Cflags: -I${includedir}/@GENERIC_VERSIONED_LIBRARY_NAME@\n")
|
||||
vmime_pc_in.write("Cflags: -I${includedir}/ @LIBGNUTLS_CFLAGS@\n")
|
||||
vmime_pc_in.close()
|
||||
@ -1709,7 +1709,7 @@ fi
|
||||
|
||||
# -- Link with Winsock (Windows)
|
||||
if test "x$VMIME_DETECT_PLATFORM" = "xwindows"; then
|
||||
VMIME_ADDITIONAL_PC_LIBS="$VMIME_ADDITIONAL_PC_LIBS -lwsock32"
|
||||
VMIME_ADDITIONAL_PC_LIBS="$VMIME_ADDITIONAL_PC_LIBS -lws2_32"
|
||||
fi
|
||||
|
||||
# -- getaddrinfo (POSIX)
|
||||
|
Loading…
Reference in New Issue
Block a user