dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
truelight
2007-03-06 22:40:45 +00:00
parent b6d5f6f746
commit c273013b79
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
config.lib
View File

@@ -786,6 +786,21 @@ make_cflags_and_ldflags() {
fi fi
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 if [ -n "$freetype_config" ]; then
CFLAGS="$CFLAGS -DWITH_FREETYPE" CFLAGS="$CFLAGS -DWITH_FREETYPE"
CFLAGS="$CFLAGS `$freetype_config --cflags | tr '\n\r' ' '`" CFLAGS="$CFLAGS `$freetype_config --cflags | tr '\n\r' ' '`"
@@ -802,21 +817,6 @@ make_cflags_and_ldflags() {
fi fi
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 if [ "$with_direct_music" != "0" ]; then
CFLAGS="$CFLAGS -DWIN32_ENABLE_DIRECTMUSIC_SUPPORT" CFLAGS="$CFLAGS -DWIN32_ENABLE_DIRECTMUSIC_SUPPORT"
# GCC 4.0+ doesn't like the DirectX includes (gives tons of # GCC 4.0+ doesn't like the DirectX includes (gives tons of