diff options
| author | glx <glx@openttd.org> | 2013-05-19 15:44:09 +0000 |
|---|---|---|
| committer | glx <glx@openttd.org> | 2013-05-19 15:44:09 +0000 |
| commit | f9be533f9eff9a8a9c57868795f99a279e7f5b84 (patch) | |
| tree | d8b3aa49fb5963964ed4f35dab98a7bf421c0599 /config.lib | |
| parent | da9729634da8853129c6c079da6dc4129c567483 (diff) | |
| download | openttd-f9be533f9eff9a8a9c57868795f99a279e7f5b84.tar.xz | |
(svn r25266) -Fix: gcc4.6 removed -mno-cygwin option
Diffstat (limited to 'config.lib')
| -rw-r--r-- | config.lib | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/config.lib b/config.lib index aeb480aa3..d13bb04ae 100644 --- a/config.lib +++ b/config.lib @@ -1487,12 +1487,15 @@ make_cflags_and_ldflags() { LDFLAGS="$LDFLAGS -mwin32" fi 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 - LDFLAGS="$LDFLAGS -mno-cygwin -Wl,--subsystem,console" + LDFLAGS="$LDFLAGS -Wl,--subsystem,console" else - LDFLAGS="$LDFLAGS -mno-cygwin -Wl,--subsystem,windows" + LDFLAGS="$LDFLAGS -Wl,--subsystem,windows" fi LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32" |