From 565679dcf800b9d5717988cba88989e45471096b Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Wed, 23 Jun 2021 14:55:10 +0300
Subject: [PATCH] remove the `-Wc,` part of the previous -static-libgcc patch:
Someone reported breakage with that:
https://github.com/libsdl-org/SDL/commit/bc51de2f87194e45eec94414bc248a6e7a0f9d26#commitcomment-52550755
---
configure | 6 +++---
configure.ac | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/configure b/configure
index cbadcd14..d3bb5e85 100755
--- a/configure
+++ b/configure
@@ -17016,7 +17016,7 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_dmedia" >&5
$as_echo "$have_dmedia" >&6; }
- # Set up files for the audio library
+
if test x$have_dmedia = xyes; then
$as_echo "#define SDL_AUDIO_DRIVER_DMEDIA 1" >>confdefs.h
@@ -17068,7 +17068,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$save_CFLAGS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_mme" >&5
$as_echo "$have_mme" >&6; }
- # Set up files for the audio library
+
if test x$have_mme = xyes; then
$as_echo "#define SDL_AUDIO_DRIVER_MMEAUDIO 1" >>confdefs.h
@@ -22253,7 +22253,7 @@ case "$host" in
have_loadso=yes
fi
# Set up the system libraries we need
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -Wc,-static-libgcc"
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -static-libgcc"
if test x$have_directx = xyes; then
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldxguid"
fi
diff --git a/configure.ac b/configure.ac
index 8ce869b7..d8e41641 100644
--- a/configure.ac
+++ b/configure.ac
@@ -405,7 +405,7 @@ CheckDMEDIA()
have_dmedia=yes
])
AC_MSG_RESULT($have_dmedia)
- # Set up files for the audio library
+
if test x$have_dmedia = xyes; then
AC_DEFINE(SDL_AUDIO_DRIVER_DMEDIA)
SOURCES="$SOURCES $srcdir/src/audio/dmedia/*.c"
@@ -442,7 +442,7 @@ CheckMME()
])
CFLAGS="$save_CFLAGS"
AC_MSG_RESULT($have_mme)
- # Set up files for the audio library
+
if test x$have_mme = xyes; then
AC_DEFINE(SDL_AUDIO_DRIVER_MMEAUDIO)
SOURCES="$SOURCES $srcdir/src/audio/mme/*.c"
@@ -2734,7 +2734,7 @@ case "$host" in
have_loadso=yes
fi
# Set up the system libraries we need
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -Wc,-static-libgcc"
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -static-libgcc"
if test x$have_directx = xyes; then
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldxguid"
fi
@@ -2797,7 +2797,7 @@ case "$host" in
AC_DEFINE(SDL_LOADSO_DLOPEN)
SOURCES="$SOURCES $srcdir/src/loadso/dlopen/*.c"
;;
- esac
+ esac
have_loadso=yes
fi
# The BeOS platform requires special setup.