From 1763e2fc26fcf988abcc61665c5249fb5513756f Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sun, 26 May 2013 22:16:42 -0700 Subject: [PATCH] Better mingw32-x64 linker flag fix, which doesn't require libtool patch --- build-scripts/ltmain.sh | 3 +-- configure | 2 +- configure.in | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build-scripts/ltmain.sh b/build-scripts/ltmain.sh index 5607845bc..63ae69dc6 100755 --- a/build-scripts/ltmain.sh +++ b/build-scripts/ltmain.sh @@ -5851,10 +5851,9 @@ func_mode_link () # -tp=* Portland pgcc target processor selection # --sysroot=* for sysroot support # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - # -{shared,static}-lib*: force GCC to link against specified libgcc -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-shared-lib*|-static-lib*) + -O*|-flto*|-fwhopr*|-fuse-linker-plugin) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" func_append compile_command " $arg" diff --git a/configure b/configure index 913cc214d..4fec887cb 100755 --- a/configure +++ b/configure @@ -22243,7 +22243,7 @@ $as_echo "#define SDL_LOADSO_WINDOWS 1" >>confdefs.h have_loadso=yes fi # Set up the system libraries we need - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -static-libgcc" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -XCClinker -static-libgcc" # The Windows platform requires special setup VERSION_SOURCES="$srcdir/src/main/windows/*.rc" SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c" diff --git a/configure.in b/configure.in index e10c8bb0a..1f75d565b 100644 --- a/configure.in +++ b/configure.in @@ -2411,7 +2411,7 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau have_loadso=yes fi # Set up the system libraries we need - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -static-libgcc" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -XCClinker -static-libgcc" # The Windows platform requires special setup VERSION_SOURCES="$srcdir/src/main/windows/*.rc" SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c"