summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortruelight <truelight@openttd.org>2007-03-02 01:18:12 +0000
committertruelight <truelight@openttd.org>2007-03-02 01:18:12 +0000
commit9181572f0f0bb2541c0df1d57c11f12b97c1e4de (patch)
treedd74f15c8c9e3feb161982c9c2accef7ed0ade9d
parentea319b78f80fb970b1f394cf0853bb03c12ba475 (diff)
downloadopenttd-9181572f0f0bb2541c0df1d57c11f12b97c1e4de.tar.xz
(svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
-rw-r--r--config.lib10
1 files changed, 10 insertions, 0 deletions
diff --git a/config.lib b/config.lib
index 56d6c402c..de15d2040 100644
--- a/config.lib
+++ b/config.lib
@@ -671,6 +671,10 @@ make_cflags_and_ldflags() {
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 @@ make_cflags_and_ldflags() {
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