Mercurial > hg > openttd
changeset 10264:035c4b4aabea draft
(svn r14495) -Change: don't use freetype, fontconfig and icu in case of building a dedicated server, unless explicit requested
author | truebrain <truebrain@openttd.org> |
---|---|
date | Sun, 19 Oct 2008 20:53:13 +0000 |
parents | 8cb1954840c3 |
children | dfd14910a9da |
files | config.lib |
diffstat | 1 files changed, 21 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/config.lib +++ b/config.lib @@ -563,7 +563,7 @@ detect_cocoa if [ "$enable_dedicated" != "0" ]; then - log 1 "checking GDI video driver... skipping" + log 1 "checking GDI video driver... dedicated server, skipping" log 1 "checking dedicated... found" if [ "$enable_network" = "0" ]; then @@ -1750,7 +1750,7 @@ fi if [ "$enable_dedicated" != "0" ]; then - log 1 "checking SDL... skipping" + log 1 "checking SDL... dedicated server, skipping" sdl_config="" return 0 @@ -1808,7 +1808,7 @@ fi if [ "$enable_dedicated" != "0" ]; then - log 1 "checking COCOA... skipping" + log 1 "checking COCOA... dedicated server, skipping" with_cocoa="0" return 0 @@ -1993,6 +1993,12 @@ freetype_config="" return 0 fi + if [ "$with_freetype" = "1" ] && [ "$enable_dedicated" != "0" ]; then + log 1 "checking libfreetype... dedicated server, skipping" + + freetype_config="" + return 0 + fi if [ "$with_zlib" = "0" ] || [ "$zlib" = "" ]; then log 1 "configure: error: libfreetype depends on zlib, which couldn't be found / was disabled" @@ -2037,6 +2043,12 @@ fontconfig_config="" return 0 fi + if [ "$with_fontconfig" = "1" ] && [ "$enable_dedicated" != "0" ]; then + log 1 "checking libfontconfig... dedicated server, skipping" + + fontconfig_config="" + return 0 + fi if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then log 1 "checking libfontconfig... WIN32, skipping" @@ -2086,6 +2098,12 @@ icu_config="" return 0 fi + if [ "$with_icu" = "1" ] && [ "$enable_dedicated" != "0" ]; then + log 1 "checking libicu... dedicated server, skipping" + + icu_config="" + return 0 + fi if [ "$with_icu" = "1" ] || [ "$with_icu" = "" ] || [ "$with_icu" = "2" ]; then icu_config="icu-config"