Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Removed dependency on libgcc_s_sjlj-1.dll when building with mingw64

  • Loading branch information
slouken committed May 26, 2013
1 parent 02cae6f commit 3eebd3e8c30db84e54b26a92a4686c70456863b2
Showing with 4 additions and 9 deletions.
  1. +2 −1 build-scripts/ltmain.sh
  2. +1 −4 configure
  3. +1 −4 configure.in
@@ -5851,9 +5851,10 @@ 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)
-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"
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"
@@ -2411,10 +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
# 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"

0 comments on commit 3eebd3e

Please sign in to comment.