Removed dependency on libgcc_s_sjlj-1.dll when building with mingw64
authorSam Lantinga <slouken@libsdl.org>
Sun, 26 May 2013 16:29:57 -0700
changeset 7234 fa967628d5e9
parent 7233 8be254bba36a
child 7235 80fefd4af771
Removed dependency on libgcc_s_sjlj-1.dll when building with mingw64
build-scripts/ltmain.sh
configure
configure.in
--- a/build-scripts/ltmain.sh	Sun May 26 16:08:15 2013 -0700
+++ b/build-scripts/ltmain.sh	Sun May 26 16:29:57 2013 -0700
@@ -5851,9 +5851,10 @@
       # -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)
+      -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-shared-lib*|-static-lib*)
         func_quote_for_eval "$arg"
 	arg="$func_quote_for_eval_result"
         func_append compile_command " $arg"
--- a/configure	Sun May 26 16:08:15 2013 -0700
+++ b/configure	Sun May 26 16:29:57 2013 -0700
@@ -22243,10 +22243,7 @@
             have_loadso=yes
         fi
         # Set up the system libraries we need
-        # SDL is unicode, and unicows emulates this on Windows 98/ME
-        # You can get this here: http://libunicows.sourceforge.net/
-        #EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lunicows"
-        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lversion -luuid"
+        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -static-libgcc"
         # The Windows platform requires special setup
         VERSION_SOURCES="$srcdir/src/main/windows/*.rc"
         SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c"
--- a/configure.in	Sun May 26 16:08:15 2013 -0700
+++ b/configure.in	Sun May 26 16:29:57 2013 -0700
@@ -2411,10 +2411,7 @@
             have_loadso=yes
         fi
         # Set up the system libraries we need
-        # SDL is unicode, and unicows emulates this on Windows 98/ME
-        # You can get this here: http://libunicows.sourceforge.net/
-        #EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lunicows"
-        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lversion -luuid"
+        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -static-libgcc"
         # The Windows platform requires special setup
         VERSION_SOURCES="$srcdir/src/main/windows/*.rc"
         SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c"