diff options
| author | truelight <truelight@openttd.org> | 2007-03-06 22:40:45 +0000 |
|---|---|---|
| committer | truelight <truelight@openttd.org> | 2007-03-06 22:40:45 +0000 |
| commit | bfcc794f70a466a5266ed5b8ed8c695a9330e667 (patch) | |
| tree | 29e33a2a1a493d1d70255b5aec64904d8da35700 | |
| parent | 1e8a2e19b388164da10ece7b63648bfc3d66f537 (diff) | |
| download | openttd-bfcc794f70a466a5266ed5b8ed8c695a9330e667.tar.xz | |
(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
| -rw-r--r-- | config.lib | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/config.lib b/config.lib index c38f4af67..fce063fbf 100644 --- a/config.lib +++ b/config.lib @@ -786,34 +786,34 @@ make_cflags_and_ldflags() { fi fi - if [ -n "$freetype_config" ]; then - CFLAGS="$CFLAGS -DWITH_FREETYPE" - CFLAGS="$CFLAGS `$freetype_config --cflags | tr '\n\r' ' '`" + 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 `$freetype_config --prefix`/lib/libfreetype.a" + LIBS="$LIBS `$fontconfig_config --variable=prefix`/lib/libfontconfig.a" else - # Is it possible to do static with freetype, if so: how? - LIBS="$LIBS `$freetype_config --libs | tr '\n\r' ' '`" + LIBS="$LIBS `$fontconfig_config --libs --static | tr '\n\r' ' '`" fi else - LIBS="$LIBS `$freetype_config --libs | tr '\n\r' ' '`" + LIBS="$LIBS `$fontconfig_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 [ -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 - LIBS="$LIBS `$fontconfig_config --variable=prefix`/lib/libfontconfig.a" + LIBS="$LIBS `$freetype_config --prefix`/lib/libfreetype.a" else - LIBS="$LIBS `$fontconfig_config --libs --static | tr '\n\r' ' '`" + # Is it possible to do static with freetype, if so: how? + LIBS="$LIBS `$freetype_config --libs | tr '\n\r' ' '`" fi else - LIBS="$LIBS `$fontconfig_config --libs | tr '\n\r' ' '`" + LIBS="$LIBS `$freetype_config --libs | tr '\n\r' ' '`" fi fi |