gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-12 01:24:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r27623) -Fix (r27616) [FS#6492]: Missed two version checks, and messed one up.

Browse Source
This commit is contained in:
frosch 2016-07-24 09:13:51 +00:00
parent e56707bd4e
commit b2fb19cc19
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.lib
View File

@ -1550,7 +1550,7 @@ make_cflags_and_ldflags() {
LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32 -limm32" 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++" LDFLAGS_BUILD="$LDFLAGS_BUILD -static-libgcc -static-libstdc++"
fi fi
if [ $cc_version -ge 407 ]; then if [ $cc_version -ge 407 ]; then
@ -1604,7 +1604,7 @@ make_cflags_and_ldflags() {
LDFLAGS="$OSX_LD_SYSROOT $LDFLAGS" LDFLAGS="$OSX_LD_SYSROOT $LDFLAGS"
fi 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. # Only set the min version when not doing an universal build.
# Universal builds set the version elsewhere. # Universal builds set the version elsewhere.
if [ "$cpu_type" = "64" ]; then 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 # 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 # warnings on it we won't be able to fix). For now just
# suppress those warnings. # suppress those warnings.
if [ $cc_version -ge 40 ]; then if [ $cc_version -ge 400 ]; then
CFLAGS="$CFLAGS -Wno-non-virtual-dtor" CFLAGS="$CFLAGS -Wno-non-virtual-dtor"
fi fi
fi fi