windows: Link gcc helpers statically on MinGW Fixes #1049 Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
diff --git a/configure.ac b/configure.ac index 002bcf6..7dd7dd4 100644 --- a/configure.ac +++ b/configure.ac
@@ -124,6 +124,7 @@ platform=windows test "x$enable_shared" = xyes && create_import_lib=yes EXTRA_CFLAGS="-mwin32 -fno-omit-frame-pointer" + EXTRA_LDFLAGS="-static-libgcc" ;; *) AC_MSG_RESULT([Null]) @@ -394,6 +395,8 @@ AC_SUBST(LT_LDFLAGS) +AC_SUBST([EXTRA_LDFLAGS]) + dnl set name of html output directory for doxygen AC_SUBST(DOXYGEN_HTMLDIR, [api-1.0])
diff --git a/libusb/Makefile.am b/libusb/Makefile.am index baf7b38..3475c9a 100644 --- a/libusb/Makefile.am +++ b/libusb/Makefile.am
@@ -80,7 +80,7 @@ endif endif -libusb_1_0_la_LDFLAGS = $(LT_LDFLAGS) +libusb_1_0_la_LDFLAGS = $(LT_LDFLAGS) $(EXTRA_LDFLAGS) libusb_1_0_la_SOURCES = libusbi.h version.h version_nano.h \ core.c descriptor.c hotplug.c io.c strerror.c sync.c \ $(PLATFORM_SRC) $(OS_SRC)
diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 888e511..6e2b30b 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h
@@ -1 +1 @@ -#define LIBUSB_NANO 11697 +#define LIBUSB_NANO 11698