From ddedcd90d3867c4e7d97aca6a137bf6ab3dfadcd Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Thu, 18 Feb 2021 20:10:24 +0300
Subject: [PATCH] configury: replace host checks against *-*-mingw32* with
*-*-mingw*
---
configure | 4 ++--
configure.ac | 22 ++++++++++------------
test/configure | 14 +++++++-------
test/configure.ac | 14 +++++++-------
4 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/configure b/configure
index 9e40706c..dad9ce60 100755
--- a/configure
+++ b/configure
@@ -15795,7 +15795,7 @@ fi
fi
case "$host" in
- *-*-cygwin* | *-*-mingw32*)
+ *-*-cygwin* | *-*-mingw*)
;;
*)
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
@@ -22123,7 +22123,7 @@ case "$host" in
have_timers=yes
fi
;;
- *-*-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 5c832a60..a167439c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,7 +152,7 @@ if test x$enable_libc = xyes; then
dnl Checks for library functions.
case "$host" in
- *-*-cygwin* | *-*-mingw32*)
+ *-*-cygwin* | *-*-mingw*)
;;
*)
AC_FUNC_ALLOCA
@@ -890,7 +890,7 @@ AS_HELP_STRING([--enable-arm-simd], [use SIMD assembly blitters on ARM [[default
save_CFLAGS="$CFLAGS"
have_arm_simd=no
CFLAGS="-x assembler-with-cpp $CFLAGS"
-
+
AC_MSG_CHECKING(for ARM SIMD)
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
.text
@@ -905,12 +905,11 @@ AS_HELP_STRING([--enable-arm-simd], [use SIMD assembly blitters on ARM [[default
uqadd8 r0, r0, r0
]])], have_arm_simd=yes)
AC_MSG_RESULT($have_arm_simd)
-
+
CFLAGS="$save_CFLAGS"
-
+
if test x$have_arm_simd = xyes; then
AC_DEFINE(SDL_ARM_SIMD_BLITTERS)
-dnl SOURCES="$SOURCES $srcdir/src/video/arm/pixman-arm-simd*.c"
SOURCES="$SOURCES $srcdir/src/video/arm/pixman-arm-simd*.S"
fi
fi
@@ -926,7 +925,7 @@ AS_HELP_STRING([--enable-arm-neon], [use NEON assembly blitters on ARM [[default
save_CFLAGS="$CFLAGS"
have_arm_neon=no
CFLAGS="-x assembler-with-cpp $CFLAGS"
-
+
AC_MSG_CHECKING(for ARM NEON)
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
.text
@@ -943,12 +942,11 @@ AS_HELP_STRING([--enable-arm-neon], [use NEON assembly blitters on ARM [[default
vmovn.u16 d0, q0
]])], have_arm_neon=yes)
AC_MSG_RESULT($have_arm_neon)
-
+
CFLAGS="$save_CFLAGS"
-
+
if test x$have_arm_neon = xyes; then
AC_DEFINE(SDL_ARM_NEON_BLITTERS)
-dnl SOURCES="$SOURCES $srcdir/src/video/arm/pixman-arm-neon*.c"
SOURCES="$SOURCES $srcdir/src/video/arm/pixman-arm-neon*.S"
fi
fi
@@ -2278,7 +2276,7 @@ CheckUSBHID()
AC_CHECK_HEADER(libusb.h, [USB_CFLAGS="-DHAVE_LIBUSB_H"])
AC_CHECK_LIB(usb, hid_init, [USB_LIBS="$USB_LIBS -lusb"])
fi
-
+
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $USB_CFLAGS"
@@ -2344,7 +2342,7 @@ CheckUSBHID()
USB_CFLAGS="$USB_CFLAGS -DUSBHID_UCR_DATA"
fi
AC_MSG_RESULT($have_usbhid_ucr_data)
-
+
AC_MSG_CHECKING(for new usbhid API)
have_usbhid_new=no
AC_TRY_COMPILE([
@@ -2618,7 +2616,7 @@ case "$host" in
have_timers=yes
fi
;;
- *-*-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 1e16e56d..205b180f 100755
--- a/test/configure
+++ b/test/configure
@@ -2885,7 +2885,7 @@ fi
case "$host" in
- *-*-cygwin* | *-*-mingw32*)
+ *-*-cygwin* | *-*-mingw*)
EXE=".exe"
MATHLIB=""
SYS_GL_LIBS="-lopengl32"
@@ -2959,12 +2959,12 @@ fi
else
SYS_GL_LIBS="-lOSMesa"
fi
- ;;
- *-*-riscos*)
- EXE=",e1f"
- MATHLIB=""
- SYS_GL_LIBS=""
- ;;
+ ;;
+ *-*-riscos* )
+ EXE=",e1f"
+ MATHLIB=""
+ SYS_GL_LIBS=""
+ ;;
*)
EXE=""
MATHLIB="-lm"
diff --git a/test/configure.ac b/test/configure.ac
index 5402e6a7..d1c8d8c9 100644
--- a/test/configure.ac
+++ b/test/configure.ac
@@ -14,7 +14,7 @@ AC_C_CONST
dnl Figure out which math library to use
case "$host" in
- *-*-cygwin* | *-*-mingw32*)
+ *-*-cygwin* | *-*-mingw*)
EXE=".exe"
MATHLIB=""
SYS_GL_LIBS="-lopengl32"
@@ -48,12 +48,12 @@ case "$host" in
else
SYS_GL_LIBS="-lOSMesa"
fi
- ;;
- *-*-riscos*)
- EXE=",e1f"
- MATHLIB=""
- SYS_GL_LIBS=""
- ;;
+ ;;
+ *-*-riscos* )
+ EXE=",e1f"
+ MATHLIB=""
+ SYS_GL_LIBS=""
+ ;;
*)
EXE=""
MATHLIB="-lm"