mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r25266) -Fix: gcc4.6 removed -mno-cygwin option

release/1.4
glx 2013-05-19 15:44:09 +00:00
parent da9729634d
commit f9be533f9e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config.lib
View File

@ -1487,12 +1487,15 @@ make_cflags_and_ldflags() {
LDFLAGS="$LDFLAGS -mwin32" LDFLAGS="$LDFLAGS -mwin32"
fi fi
if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then
flags="$flags -mno-cygwin" if [ $cc_version -lt 46 ]; then
flags="$flags -mno-cygwin"
LDFLAGS="$LDFLAGS -mno-cygwin"
fi
if [ "$enable_console" != "0" ]; then if [ "$enable_console" != "0" ]; then
LDFLAGS="$LDFLAGS -mno-cygwin -Wl,--subsystem,console" LDFLAGS="$LDFLAGS -Wl,--subsystem,console"
else else
LDFLAGS="$LDFLAGS -mno-cygwin -Wl,--subsystem,windows" LDFLAGS="$LDFLAGS -Wl,--subsystem,windows"
fi fi
LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32" LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32"