Changeset - r22416:71fd7d8c8f6e
[Not reviewed]
master
0 1 0
frosch - 8 years ago 2016-07-24 09:13:51
frosch@openttd.org
(svn r27623) -Fix (r27616) [FS#6492]: Missed two version checks, and messed one up.
1 file changed with 3 insertions and 3 deletions:
0 comments (0 inline, 0 general)
config.lib
Show inline comments
 
@@ -1547,13 +1547,13 @@ make_cflags_and_ldflags() {
 
			else
 
				LDFLAGS="$LDFLAGS -Wl,--subsystem,windows"
 
			fi
 

	
 
			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
 
				CFLAGS="$CFLAGS -mno-ms-bitfields"
 
			fi
 
		fi
 
@@ -1601,13 +1601,13 @@ make_cflags_and_ldflags() {
 
		if [ "$enable_universal" = "0" ]; then
 
			# Universal builds set this elsewhere
 
			CFLAGS="$OSX_SYSROOT $CFLAGS"
 
			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
 
				CFLAGS="$CFLAGS -mmacosx-version-min=10.5"
 
			else
 
				gcc_cpu=`$cc_host -dumpmachine`
 
@@ -1779,13 +1779,13 @@ 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
 
		if [ $cc_version -ge 400 ]; then
 
			CFLAGS="$CFLAGS -Wno-non-virtual-dtor"
 
		fi
 
	fi
 

	
 
	if [ -n "$libtimidity_config" ]; then
 
		CFLAGS="$CFLAGS -DLIBTIMIDITY"
0 comments (0 inline, 0 general)