cpp/openttd-patchpack/source Changeset - r22416:71fd7d8c8f6e

Changeset - r22416:71fd7d8c8f6e

Parent rev.

Child rev.

[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:

config.lib

0 comments (0 inline, 0 general)

config.lib

➞

Show inline comments

@@ @@ -1550,7 +1550,7 @@ make_cflags_and_ldflags() { @@
 			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
@@ @@ -1604,7 +1604,7 @@ make_cflags_and_ldflags() { @@
 			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
@@ @@ -1782,7 +1782,7 @@ make_cflags_and_ldflags() { @@
 		# 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

0 comments (0 inline, 0 general)