From a29fe292969157c9262eedf2249b38431d65d00a Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Thu, 18 Feb 2021 20:10:50 +0300 Subject: [PATCH] configury: replace host checks against *-*-mingw32* with *-*-mingw* --- configure | 10 +++++----- configure.ac | 10 +++++----- test/configure | 2 +- test/configure.ac | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 2402fa771..737d9df9f 100755 --- a/configure +++ b/configure @@ -15980,7 +15980,7 @@ $as_echo "no" >&6; } fi case "$host" in - *-*-mingw32*) + *-*-mingw*) # Except on msys, where make can't handle full pathnames (bug 1972) ;; *) @@ -16666,7 +16666,7 @@ $as_echo "#define HAVE_M_PI /**/" >>confdefs.h case "$host" in - *-*-cygwin* | *-*-mingw32*) + *-*-cygwin* | *-*-mingw*) ;; *) # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works @@ -24518,7 +24518,7 @@ fi require_hidapi_libusb=yes ;; # RAWINPUT is only available on Win32, but can be enabled if HIDAPI is - *-*-cygwin* | *-*-mingw32*) + *-*-cygwin* | *-*-mingw*) enable_joystick_rawinput=yes ;; esac @@ -24640,7 +24640,7 @@ $as_echo "$as_me: WARNING: You must have SDL_LoadObject() support for dynamic li *-*-darwin* ) libusb_lib="libusb-1.0.0.dylib" ;; - *-*-cygwin* | *-*-mingw32* ) + *-*-cygwin* | *-*-mingw* ) libusb_lib="libusb-1.0.dll" ;; esac @@ -25114,7 +25114,7 @@ $as_echo "#define SDL_TIMER_UNIX 1" >>confdefs.h SOURCES="$SOURCES $srcdir/src/core/linux/SDL_threadprio.c" SOURCES="$SOURCES $srcdir/src/core/unix/*.c" ;; - *-*-cygwin* | *-*-mingw32*) + *-*-cygwin* | *-*-mingw*) ARCH=win32 if test "$build" != "$host"; then # cross-compiling # Default cross-compile location diff --git a/configure.ac b/configure.ac index cad96743e..0c27370d7 100644 --- a/configure.ac +++ b/configure.ac @@ -60,7 +60,7 @@ PKG_PROG_PKG_CONFIG dnl Make sure that srcdir is a full pathname case "$host" in - *-*-mingw32*) + *-*-mingw*) # Except on msys, where make can't handle full pathnames (bug 1972) ;; *) @@ -321,7 +321,7 @@ if test x$enable_libc = xyes; then dnl Checks for library functions. case "$host" in - *-*-cygwin* | *-*-mingw32*) + *-*-cygwin* | *-*-mingw*) ;; *) AC_FUNC_ALLOCA @@ -3418,7 +3418,7 @@ AS_HELP_STRING([--enable-hidapi-libusb], [use libusb for low level joystick driv require_hidapi_libusb=yes ;; # RAWINPUT is only available on Win32, but can be enabled if HIDAPI is - *-*-cygwin* | *-*-mingw32*) + *-*-cygwin* | *-*-mingw*) enable_joystick_rawinput=yes ;; esac @@ -3458,7 +3458,7 @@ AS_HELP_STRING([--enable-hidapi-libusb], [use libusb for low level joystick driv *-*-darwin* ) libusb_lib="libusb-1.0.0.dylib" ;; - *-*-cygwin* | *-*-mingw32* ) + *-*-cygwin* | *-*-mingw* ) libusb_lib="libusb-1.0.dll" ;; esac @@ -3795,7 +3795,7 @@ case "$host" in SOURCES="$SOURCES $srcdir/src/core/linux/SDL_threadprio.c" SOURCES="$SOURCES $srcdir/src/core/unix/*.c" ;; - *-*-cygwin* | *-*-mingw32*) + *-*-cygwin* | *-*-mingw*) ARCH=win32 if test "$build" != "$host"; then # cross-compiling # Default cross-compile location diff --git a/test/configure b/test/configure index 312e6488e..4f3793b79 100755 --- a/test/configure +++ b/test/configure @@ -2899,7 +2899,7 @@ ISWINDOWS="false" ISMACOSX="false" case "$host" in - *-*-cygwin* | *-*-mingw32*) + *-*-cygwin* | *-*-mingw*) ISWINDOWS="true" EXE=".exe" MATHLIB="" diff --git a/test/configure.ac b/test/configure.ac index 6efa7e19e..a22e1a98e 100644 --- a/test/configure.ac +++ b/test/configure.ac @@ -21,7 +21,7 @@ ISMACOSX="false" dnl Figure out which math library to use case "$host" in - *-*-cygwin* | *-*-mingw32*) + *-*-cygwin* | *-*-mingw*) ISWINDOWS="true" EXE=".exe" MATHLIB=""