cpp/openttd-patchpack/source Changeset - r6241:a071ce2e9531

Changeset - r6241:a071ce2e9531

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

truelight - 18 years ago 2007-03-06 22:40:45
truelight@openttd.org

(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important

1 file changed with 15 insertions and 15 deletions:

config.lib

0 comments (0 inline, 0 general)

config.lib

➞

Show inline comments

@@ @@ -783,12 +783,27 @@ make_cflags_and_ldflags() { @@
 			fi
 		else
 			LIBS="$LIBS `$png_config --ldflags --libs --L_opts | tr '\n\r' '  '`"
 		fi
 	fi
 	if [ -n "$fontconfig_config" ]; then
 		CFLAGS="$CFLAGS -DWITH_FONTCONFIG"
 		CFLAGS="$CFLAGS `$fontconfig_config --cflags | tr '\n\r' '  '`"
 		if [ "$enable_static" != "0" ]; then
 			if [ "$os" = "OSX" ]; then
 				LIBS="$LIBS `$fontconfig_config --variable=prefix`/lib/libfontconfig.a"
 			else
 				LIBS="$LIBS `$fontconfig_config --libs --static | tr '\n\r' '  '`"
 			fi
 		else
 			LIBS="$LIBS `$fontconfig_config --libs | tr '\n\r' '  '`"
 		fi
 	fi
 	if [ -n "$freetype_config" ]; then
 		CFLAGS="$CFLAGS -DWITH_FREETYPE"
 		CFLAGS="$CFLAGS `$freetype_config --cflags | tr '\n\r' '  '`"
 		if [ "$enable_static" != "0" ]; then
 			if [ "$os" = "OSX" ]; then
@@ @@ -799,27 +814,12 @@ make_cflags_and_ldflags() { @@
 			fi
 		else
 			LIBS="$LIBS `$freetype_config --libs | tr '\n\r' '  '`"
 		fi
 	fi
 	if [ -n "$fontconfig_config" ]; then
 		CFLAGS="$CFLAGS -DWITH_FONTCONFIG"
 		CFLAGS="$CFLAGS `$fontconfig_config --cflags | tr '\n\r' '  '`"
 		if [ "$enable_static" != "0" ]; then
 			if [ "$os" = "OSX" ]; then
 				LIBS="$LIBS `$fontconfig_config --variable=prefix`/lib/libfontconfig.a"
 			else
 				LIBS="$LIBS `$fontconfig_config --libs --static | tr '\n\r' '  '`"
 			fi
 		else
 			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

0 comments (0 inline, 0 general)