pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Sam Lantinga 2013-05-26 16:29:57 -07:00
parent d944115cb1
commit 1990b00614
3 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
build-scripts/ltmain.sh
View file

@ -5851,9 +5851,10 @@ func_mode_link ()
# -tp=* Portland pgcc target processor selection # -tp=* Portland pgcc target processor selection
# --sysroot=* for sysroot support # --sysroot=* for sysroot support
# -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization # -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*| \ -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=*| \ -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" func_quote_for_eval "$arg"
arg="$func_quote_for_eval_result" arg="$func_quote_for_eval_result"
func_append compile_command " $arg" func_append compile_command " $arg"

5
configure vendored
View file

@ -22243,10 +22243,7 @@ $as_echo "#define SDL_LOADSO_WINDOWS 1" >>confdefs.h
have_loadso=yes have_loadso=yes
fi fi
# Set up the system libraries we need # Set up the system libraries we need
# SDL is unicode, and unicows emulates this on Windows 98/ME EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -static-libgcc"
# 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"
# The Windows platform requires special setup # The Windows platform requires special setup
VERSION_SOURCES="$srcdir/src/main/windows/*.rc" VERSION_SOURCES="$srcdir/src/main/windows/*.rc"
SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c" SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c"

5
configure.in
View file

@ -2411,10 +2411,7 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
have_loadso=yes have_loadso=yes
fi fi
# Set up the system libraries we need # Set up the system libraries we need
# SDL is unicode, and unicows emulates this on Windows 98/ME EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -static-libgcc"
# 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"
# The Windows platform requires special setup # The Windows platform requires special setup
VERSION_SOURCES="$srcdir/src/main/windows/*.rc" VERSION_SOURCES="$srcdir/src/main/windows/*.rc"
SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c" SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c"