diff options
| author | frosch <frosch@openttd.org> | 2016-07-24 09:13:51 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2016-07-24 09:13:51 +0000 |
| commit | b2fb19cc190160822d18a53d86070136b73532f9 (patch) | |
| tree | 2be2aabd2fb07441d67340928d614a1f55187dbe /config.lib | |
| parent | e56707bd4ed5b53b5655c6bbc83b9e7770a4916e (diff) | |
| download | openttd-b2fb19cc190160822d18a53d86070136b73532f9.tar.xz | |
(svn r27623) -Fix (r27616) [FS#6492]: Missed two version checks, and messed one up.
Diffstat (limited to 'config.lib')
| -rw-r--r-- | config.lib | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config.lib b/config.lib index 02a1573cc..ab9bb82b6 100644 --- a/config.lib +++ b/config.lib @@ -1550,7 +1550,7 @@ make_cflags_and_ldflags() { LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32 -limm32" - if [ $cc_version -ge 40 ]; then + if [ $cc_version -ge 404 ]; then LDFLAGS_BUILD="$LDFLAGS_BUILD -static-libgcc -static-libstdc++" fi if [ $cc_version -ge 407 ]; then @@ -1604,7 +1604,7 @@ make_cflags_and_ldflags() { LDFLAGS="$OSX_LD_SYSROOT $LDFLAGS" fi - if [ "$enable_universal" = "0" ] && [ $cc_version -gt 40 ]; then + if [ "$enable_universal" = "0" ] && [ $cc_version -gt 400 ]; then # Only set the min version when not doing an universal build. # Universal builds set the version elsewhere. if [ "$cpu_type" = "64" ]; then @@ -1782,7 +1782,7 @@ make_cflags_and_ldflags() { # GCC 4.0+ doesn't like the DirectX includes (gives tons of # warnings on it we won't be able to fix). For now just # suppress those warnings. - if [ $cc_version -ge 40 ]; then + if [ $cc_version -ge 400 ]; then CFLAGS="$CFLAGS -Wno-non-virtual-dtor" fi fi |