From 9fb5e2edb2adf7f40597b01320c8cc926b4bb57f Mon Sep 17 00:00:00 2001 From: Tormod Volden Date: Sun, 4 Sep 2022 14:47:00 +0200 Subject: [PATCH] windows: Omit -mwin32 GCC option for MSYS/MinGW Only keep it for Cygwin. Clang doesn't support this option, and it seems only needed for Cygwin since MinGW predefines e.g. the _WIN32 macro anyway. From GCC documentation: -mwin32 This option is available for Cygwin and MinGW targets. It specifies that the typical Microsoft Windows predefined macros are to be set in the pre-processor, but does not influence the choice of runtime library/startup code. References #1192 Signed-off-by: Tormod Volden --- configure.ac | 2 +- libusb/version_nano.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index e05faf4..0f3d79e 100644 --- a/configure.ac +++ b/configure.ac @@ -128,7 +128,7 @@ wasm32-**) backend=windows platform=windows test "x$enable_shared" = xyes && create_import_lib=yes - EXTRA_CFLAGS="-mwin32 -fno-omit-frame-pointer" + EXTRA_CFLAGS="-fno-omit-frame-pointer" EXTRA_LDFLAGS="-static-libgcc" ;; *) diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 0229c60..a346258 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11779 +#define LIBUSB_NANO 11780