Mercurial > hg > openttd
changeset 6191:82d6cc4ce36f draft
(svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
| author | truelight <truelight@openttd.org> |
|---|---|
| date | Fri, 02 Mar 2007 01:18:12 +0000 |
| parents | f9ef22413f22 |
| children | 44da08e7d3d1 |
| files | config.lib |
| diffstat | 1 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/config.lib +++ b/config.lib @@ -671,6 +671,10 @@ if [ "$os" = "CYGWIN" ] || [ "$os" = "MINGW" ]; then LDFLAGS="$LDFLAGS -Wl,--subsystem,windows" LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32" + # GCC 4.0+ complains about that we break strict-aliasing. + # On most places we don't see how to fix it, and it doesn't + # break anything. So disable strict-aliasing to make the + # compiler all happy. if [ $cc_version -ge 40 ]; then CFLAGS="$CFLAGS -fno-strict-aliasing" fi @@ -793,6 +797,12 @@ if [ "$with_direct_music" != "0" ]; then CFLAGS="$CFLAGS -DWIN32_ENABLE_DIRECTMUSIC_SUPPORT" + # 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 + CFLAGS="$CFLAGS -Wno-non-virtual-dtor" + fi fi if [ -n "$libtimidity" ]; then