cpp/openttd-patchpack/source Changeset - r6191:5d33aa11398b

Changeset - r6191:5d33aa11398b

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

truelight - 18 years ago 2007-03-02 01:18:12
truelight@openttd.org

(svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code

1 file changed with 10 insertions and 0 deletions:

config.lib

0 comments (0 inline, 0 general)

config.lib

➞

Show inline comments

@@ @@ -668,12 +668,16 @@ make_cflags_and_ldflags() { @@
 		LDFLAGS="$LDFLAGS -mno-cygwin"
 	fi
 	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
 	fi
 	if [ "$os" != "CYGWIN" ] && [ "$os" != "FREEBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "MORPHOS" ] && [ "$os" != "OSX" ] && [ "$os" != "WINCE" ] && [ "$os" != "PSP" ]; then
@@ @@ -790,12 +794,18 @@ make_cflags_and_ldflags() { @@
 			LIBS="$LIBS `$fontconfig_config --libs | tr '\n\r' '  '`"
 		fi
 	fi
 	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
 		if [ "$enable_static" != "0" ]; then
 			LIBS="$LIBS $libtimidity"
 		else

0 comments (0 inline, 0 general)